From 74e2a009585de99ba9ec685fa9fd8023a1134d8d Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 17 Jan 2024 16:12:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   1 +
 .../版本日志/SGGLDB_WH_2024-01-09.sql     | 261 +++++
 SGGL/BLL/API/APIGetHttpService.cs             |   5 +-
 SGGL/BLL/BLL.csproj                           |   3 +
 SGGL/BLL/Common/Const.cs                      |   4 +
 .../DriverPrepareDriverDataService.cs         |   1 +
 .../DriverPrepareDriverDataTypeService.cs     | 149 +++
 .../DriverPrepareDutyItemService.cs           | 272 +++++
 .../DriverPrepare/DriverPrepareDutyService.cs |   2 +-
 .../DriverPrepareSchemePlanItemService.cs     | 131 +++
 .../DriverPrepareSchemePlanService.cs         |   8 +
 SGGL/BLL/WebService/CNCECHSSEWebService.cs    |  43 +-
 SGGL/FineUIPro.Web/ErrLog.txt                 |  19 +
 .../TestRun/开车方案编制计划.xlsx     | Bin 0 -> 10691 bytes
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |  24 +
 .../TestRun/DriverPrepare/DriverData.aspx     | 131 ++-
 .../TestRun/DriverPrepare/DriverData.aspx.cs  | 245 ++++-
 .../DriverPrepare/DriverData.aspx.designer.cs |  63 ++
 .../DriverPrepare/DriverDataEdit.aspx.cs      |   2 +
 .../DriverPrepare/DriverDataTypeEdit.aspx     |  55 +
 .../DriverPrepare/DriverDataTypeEdit.aspx.cs  |  65 ++
 .../DriverDataTypeEdit.aspx.designer.cs       | 105 ++
 .../TestRun/DriverPrepare/Duty.aspx           | 121 ++-
 .../TestRun/DriverPrepare/Duty.aspx.cs        | 100 +-
 .../DriverPrepare/Duty.aspx.designer.cs       |  80 +-
 .../TestRun/DriverPrepare/DutyEdit.aspx       | 167 ++--
 .../TestRun/DriverPrepare/DutyEdit.aspx.cs    | 153 ++-
 .../DriverPrepare/DutyEdit.aspx.designer.cs   | 140 +--
 .../TestRun/DriverPrepare/SchemePlan.aspx     |  79 +-
 .../TestRun/DriverPrepare/SchemePlan.aspx.cs  | 256 +++--
 .../DriverPrepare/SchemePlan.aspx.designer.cs |  61 +-
 .../TestRun/DriverPrepare/SchemePlanEdit.aspx |  44 +-
 .../DriverPrepare/SchemePlanEdit.aspx.cs      | 122 +++
 .../SchemePlanEdit.aspx.designer.cs           |  56 +-
 .../DriverPrepare/SchemePlanItemAdd.aspx      |  35 +
 .../DriverPrepare/SchemePlanItemAdd.aspx.cs   |  77 ++
 .../SchemePlanItemAdd.aspx.designer.cs        |  69 ++
 .../DriverPrepare/SchemePlanItemSelect.aspx   |  59 ++
 .../SchemePlanItemSelect.aspx.cs              | 126 +++
 .../SchemePlanItemSelect.aspx.designer.cs     |  96 ++
 .../ZHGL/ServerCheck/CheckRectify.aspx.cs     | 144 ++-
 .../FineUIPro.Web/common/mainProject2.aspx.cs |  18 +-
 SGGL/Model/APIItem/CNCEC/CheckRectifyItem.cs  | 266 +++++
 .../APIItem/CNCEC/SubUnitReportItemItem.cs    | 132 +++
 SGGL/Model/APIItem/CNCEC/UpCheckReportItem.cs | 142 +++
 .../APIItem/CNCEC/UpCheckReportItemItem.cs    |  98 ++
 .../APIItem/CNCEC/UpCheckReportItemItem2.cs   | 134 +++
 SGGL/Model/Model.cs                           | 940 +++++++++++++++++-
 SGGL/Model/Model.csproj                       |   5 +
 49 files changed, 4594 insertions(+), 715 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-01-09.sql
 create mode 100644 SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverDataTypeService.cs
 create mode 100644 SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDutyItemService.cs
 create mode 100644 SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanItemService.cs
 create mode 100644 SGGL/FineUIPro.Web/File/Excel/TestRun/开车方案编制计划.xlsx
 create mode 100644 SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverDataTypeEdit.aspx
 create mode 100644 SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverDataTypeEdit.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverDataTypeEdit.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx
 create mode 100644 SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemSelect.aspx
 create mode 100644 SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemSelect.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemSelect.aspx.designer.cs
 create mode 100644 SGGL/Model/APIItem/CNCEC/CheckRectifyItem.cs
 create mode 100644 SGGL/Model/APIItem/CNCEC/SubUnitReportItemItem.cs
 create mode 100644 SGGL/Model/APIItem/CNCEC/UpCheckReportItem.cs
 create mode 100644 SGGL/Model/APIItem/CNCEC/UpCheckReportItemItem.cs
 create mode 100644 SGGL/Model/APIItem/CNCEC/UpCheckReportItemItem2.cs

diff --git a/.gitignore b/.gitignore
index 6855852f..2c25a659 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /SGGL/FineUIPro.Web/FileUpload/ProjectAttachUrl/2023-09
 /CreateModel_lpf.bat
 /ReleasePackerALL2017 - 副本 (2).bat
+/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverPrepare/DriverData/2024-01
diff --git a/DataBase/版本日志/SGGLDB_WH_2024-01-09.sql b/DataBase/版本日志/SGGLDB_WH_2024-01-09.sql
new file mode 100644
index 00000000..32bb201b
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-01-09.sql
@@ -0,0 +1,261 @@
+
+CREATE TABLE [dbo].[DriverPrepare_DriverDataType](
+	[DriverDataTypeId] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[DriverDataTypeCode] [nvarchar](50) NULL,
+	[DriverDataTypeName] [nvarchar](50) NULL,
+	[ParentId] [nvarchar](50) NULL,
+ CONSTRAINT [PK_DriverPrepare_DriverDataType] PRIMARY KEY CLUSTERED 
+(
+	[DriverDataTypeId] 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].[DriverPrepare_DriverDataType]  WITH CHECK ADD  CONSTRAINT [FK_DriverPrepare_DriverDataType_Base_Project] FOREIGN KEY([ProjectId])
+REFERENCES [dbo].[Base_Project] ([ProjectId])
+GO
+
+ALTER TABLE [dbo].[DriverPrepare_DriverDataType] CHECK CONSTRAINT [FK_DriverPrepare_DriverDataType_Base_Project]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DriverDataType', @level2type=N'COLUMN',@level2name=N'DriverDataTypeId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DriverDataType', @level2type=N'COLUMN',@level2name=N'ProjectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DriverDataType', @level2type=N'COLUMN',@level2name=N'DriverDataTypeCode'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DriverDataType', @level2type=N'COLUMN',@level2name=N'DriverDataTypeName'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DriverDataType', @level2type=N'COLUMN',@level2name=N'ParentId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���������ռ�����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DriverDataType'
+GO
+
+
+alter table [dbo].[DriverPrepare_DriverData] add DriverDataTypeId nvarchar(50) null
+GO
+
+
+
+CREATE TABLE [dbo].[DriverPrepare_DutyItem](
+	[DutyItemId] [nvarchar](50) NOT NULL,
+	[DutyId] [nvarchar](50) NULL,
+	[Stage] [nvarchar](50) NULL,
+	[Code] [int] NULL,
+	[ActivityContent] [nvarchar](50) NULL,
+	[Item1] [bit] NULL,
+	[Item2] [bit] NULL,
+	[Item3] [bit] NULL,
+	[Item4] [bit] NULL,
+	[Item5] [bit] NULL,
+	[Item6] [bit] NULL,
+	[Item7] [bit] NULL,
+	[Item8] [bit] NULL,
+	[Item9] [bit] NULL,
+	[Item10] [bit] NULL,
+	[Item11] [bit] NULL,
+	[Item12] [bit] NULL,
+	[Item13] [bit] NULL,
+	[Item14] [bit] NULL,
+	[Remark] [nvarchar](200) NULL,
+ CONSTRAINT [PK_DriverPrepare_DutyItem] PRIMARY KEY CLUSTERED 
+(
+	[DutyItemId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DutyItem', @level2type=N'COLUMN',@level2name=N'DutyItemId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DutyItem', @level2type=N'COLUMN',@level2name=N'DutyId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�׶�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DutyItem', @level2type=N'COLUMN',@level2name=N'Stage'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DutyItem', @level2type=N'COLUMN',@level2name=N'Code'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DutyItem', @level2type=N'COLUMN',@level2name=N'ActivityContent'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�����ļ�����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DutyItem', @level2type=N'COLUMN',@level2name=N'Item1'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������̱���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DutyItem', @level2type=N'COLUMN',@level2name=N'Item2'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʵʩ��������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DutyItem', @level2type=N'COLUMN',@level2name=N'Item3'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����   ָ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DutyItem', @level2type=N'COLUMN',@level2name=N'Item4'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ʱ    ��ʩ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DutyItem', @level2type=N'COLUMN',@level2name=N'Item5'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��֯   ָ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DutyItem', @level2type=N'COLUMN',@level2name=N'Item6'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����    ִ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DutyItem', @level2type=N'COLUMN',@level2name=N'Item7'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��¼     ����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DutyItem', @level2type=N'COLUMN',@level2name=N'Item8'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���ù��̱���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DutyItem', @level2type=N'COLUMN',@level2name=N'Item9'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ԭ��    ��Ӧ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DutyItem', @level2type=N'COLUMN',@level2name=N'Item10'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����     ����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DutyItem', @level2type=N'COLUMN',@level2name=N'Item11'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DutyItem', @level2type=N'COLUMN',@level2name=N'Item12'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��Ʒ������Ӧ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DutyItem', @level2type=N'COLUMN',@level2name=N'Item13'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�������ϴ���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DutyItem', @level2type=N'COLUMN',@level2name=N'Item14'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DutyItem', @level2type=N'COLUMN',@level2name=N'Remark'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��������ηֹ���ϸ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_DutyItem'
+GO
+
+
+alter table [dbo].[DriverPrepare_Duty] alter column [DutyName] nvarchar(50) null
+alter table [dbo].[DriverPrepare_Duty] alter column [DutyCode] nvarchar(50) null
+GO
+
+
+
+
+CREATE TABLE [dbo].[DriverPrepare_SchemePlanItem](
+	[SchemePlanItemId] [nvarchar](50) NOT NULL,
+	[SchemePlanId] [nvarchar](50) NULL,
+	[SolutionName] [nvarchar](100) NULL,
+	[SortIndex] [int] NULL,
+ CONSTRAINT [PK_DriverPrepare_SchemePlanItem] PRIMARY KEY CLUSTERED 
+(
+	[SchemePlanItemId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_SchemePlanItem', @level2type=N'COLUMN',@level2name=N'SchemePlanItemId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_SchemePlanItem', @level2type=N'COLUMN',@level2name=N'SchemePlanId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_SchemePlanItem', @level2type=N'COLUMN',@level2name=N'SolutionName'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_SchemePlanItem', @level2type=N'COLUMN',@level2name=N'SortIndex'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�����������Ƽƻ���ϸ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverPrepare_SchemePlanItem'
+GO
+
+
+
+
+
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�ϳɰ�������Ŀ','�豸���ܵ�ϵͳ��ϴ����ɨ����',1)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�ϳɰ�������Ŀ','�úͷ���Գ�����',2)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�ϳɰ�������Ŀ','������̼ѹ����͸ƽ�Գ�����',3)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�ϳɰ�������Ŀ','������̼ѹ�����Գ�����',4)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�ϳɰ�������Ŀ','���ع���ϵͳ���ܷ���',5)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�ϳɰ�������Ŀ','ϵͳ�û�����',6)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�ϳɰ�������Ŀ','����߻���װ���',7)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�ϳɰ�������Ŀ','��ѹϵͳ����䷽��',8)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�ϳɰ�������Ŀ','��ѹϵͳ���¡���ѹ����',9)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�ϳɰ�������Ŀ','ϵͳ������鷽��',10)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�ϳɰ�������Ŀ','���������Գ�����',11)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�ϳɰ�������Ŀ','�������Գ�����',12)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�ϳɰ�������Ŀ','����װ��Ͷ���Գ�����',13)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�ϳɰ�������Ŀ','�����װ��Ͷ���Գ�����',14)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'������Ŀ','���豸�����Գ�����',1)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'������Ŀ','�ܵ���ϴ��ɨ����',2)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'������Ŀ','���ù��̺�����ܵ���ϴ��ɨ����',3)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'������Ŀ','�����ܵ���ɨ����',4)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'������Ŀ','�����Գ�����',5)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'������Ŀ','Ͷ���Գ�����',6)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'������Ŀ','���ܿ��˷���',7)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'LNG��Ŀ','110KV�������װ���ܵ緽��',1)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'LNG��Ŀ','������Է���',2)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'LNG��Ŀ','��ˮ���������ͷ����Ұ�װ�����Ժ��ܵ緽��',3)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'LNG��Ŀ','�DZ�����ʩ������',4)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'LNG��Ŀ','DCSϵͳ���Է���',5)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'LNG��Ŀ','SISϵͳ���Է���',6)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'LNG��Ŀ','GDSϵͳ���Է���',7)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'LNG��Ŀ','�����Խ�ϵͳ���Է���',8)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'LNG��Ŀ','���Ӽ�ؼ��ܽ籨��ϵͳ���Է���',9)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'LNG��Ŀ','����ͨ��ϵͳ���Է���',10)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'LNG��Ŀ','һ����õ����Գ�����',11)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'LNG��Ŀ','BOGѹ������ѭ������',12)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'LNG��Ŀ','BOGѹ���������Գ�����',13)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'LNG��Ŀ','���ù���ϵͳ��ϴ��ɨ����',14)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'LNG��Ŀ','����ϵͳ��ɨ����',15)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'LNG��Ŀ','���ù���ϵͳ���ܷ���',16)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'LNG��Ŀ','����ϵͳ���ܷ���',17)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'LNG��Ŀ','ϵͳ���������û�����',18)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'LNG��Ŀ','���޵��������û�����',19)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'LNG��Ŀ','���ܿ��˳���',20)
+GO
\ No newline at end of file
diff --git a/SGGL/BLL/API/APIGetHttpService.cs b/SGGL/BLL/API/APIGetHttpService.cs
index 6a40502c..84abcbbb 100644
--- a/SGGL/BLL/API/APIGetHttpService.cs
+++ b/SGGL/BLL/API/APIGetHttpService.cs
@@ -29,7 +29,10 @@ namespace BLL
                     request.Headers.Add(i.ToString(), header[i].ToString());
                 }
             }
-            request.Headers.Add("token", "AF17168B-87BD-4GLY-1111-F0A0A1158F9B");
+            else
+            {
+                request.Headers.Add("token", "AF17168B-87BD-4GLY-1111-F0A0A1158F9B");
+            }
             request.Timeout = 20000; /// 设置5秒超时
             if (!string.IsNullOrEmpty(data))
             {
diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index 377f4724..70ed765f 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -732,9 +732,12 @@
     <Compile Include="TestRun\DriverHse\RoadMapService.cs" />
     <Compile Include="TestRun\DriverPrepare\DriverPrepareDriverConStudyService.cs" />
     <Compile Include="TestRun\DriverPrepare\DriverPrepareDriverDataService.cs" />
+    <Compile Include="TestRun\DriverPrepare\DriverPrepareDriverDataTypeService.cs" />
     <Compile Include="TestRun\DriverPrepare\DriverPrepareDriverPersonPlanService.cs" />
     <Compile Include="TestRun\DriverPrepare\DriverPrepareDriverPlanService.cs" />
+    <Compile Include="TestRun\DriverPrepare\DriverPrepareDutyItemService.cs" />
     <Compile Include="TestRun\DriverPrepare\DriverPrepareDutyService.cs" />
+    <Compile Include="TestRun\DriverPrepare\DriverPrepareSchemePlanItemService.cs" />
     <Compile Include="TestRun\DriverPrepare\DriverPrepareSchemePlanService.cs" />
     <Compile Include="TestRun\DriverProgressService.cs" />
     <Compile Include="TestRun\DriverReport\DriverReportService.cs" />
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index a858ec4d..80f6b286 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -3182,6 +3182,10 @@ namespace BLL
         /// 试车系统划分
         /// </summary>
         public const string TestRunUrl = "File\\Excel\\TestRun\\试车系统划分.xlsx";
+        /// <summary>
+        /// 开车方案编制计划模板文件原始虚拟路径
+        /// </summary>
+        public const string SchemePlanTemplateUrl = "File\\Excel\\TestRun\\开车方案编制计划.xlsx";
         #endregion
 
         #region 绩效考核模板文件路径
diff --git a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverDataService.cs b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverDataService.cs
index e28a9e12..28f967d2 100644
--- a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverDataService.cs
+++ b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverDataService.cs
@@ -22,6 +22,7 @@ namespace BLL
                 newDriverData.Code = DriverPrepareDriverData.Code;
                 newDriverData.DriverDataName = DriverPrepareDriverData.DriverDataName;
                 newDriverData.Remark = DriverPrepareDriverData.Remark;
+                newDriverData.DriverDataTypeId = DriverPrepareDriverData.DriverDataTypeId;
 
                 db.DriverPrepare_DriverData.InsertOnSubmit(newDriverData);
                 db.SubmitChanges();
diff --git a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverDataTypeService.cs b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverDataTypeService.cs
new file mode 100644
index 00000000..99313412
--- /dev/null
+++ b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverDataTypeService.cs
@@ -0,0 +1,149 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web.UI.WebControls;
+
+namespace BLL
+{
+    public class DriverPrepareDriverDataTypeService
+    {
+        /// <summary>
+        /// 添加开车资料收集类别
+        /// </summary>
+        /// <param name="Installation"></param>
+        public static void AddDriverDataType(Model.DriverPrepare_DriverDataType DriverDataType)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.DriverPrepare_DriverDataType newDriverDataType = new Model.DriverPrepare_DriverDataType();
+
+            newDriverDataType.DriverDataTypeId = DriverDataType.DriverDataTypeId;
+            newDriverDataType.ProjectId = DriverDataType.ProjectId;
+            newDriverDataType.DriverDataTypeCode = DriverDataType.DriverDataTypeCode;
+            newDriverDataType.DriverDataTypeName = DriverDataType.DriverDataTypeName;
+            newDriverDataType.ParentId = DriverDataType.ParentId;
+
+            db.DriverPrepare_DriverDataType.InsertOnSubmit(newDriverDataType);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改开车资料收集类别
+        /// </summary>
+        /// <param name="DriverDataType"></param>
+        public static void UpdateDriverDataType(Model.DriverPrepare_DriverDataType DriverDataType)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.DriverPrepare_DriverDataType newDriverDataType = db.DriverPrepare_DriverDataType.First(e => e.DriverDataTypeId == DriverDataType.DriverDataTypeId);
+            newDriverDataType.DriverDataTypeCode = DriverDataType.DriverDataTypeCode;
+            newDriverDataType.DriverDataTypeName = DriverDataType.DriverDataTypeName;
+            newDriverDataType.ParentId = DriverDataType.ParentId;
+         
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 根据一个开车资料收集类别信息
+        /// </summary>
+        /// <param name="DriverDataTypeCode"></param>
+        public static void DeleteDriverDataType(string DriverDataTypeId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.DriverPrepare_DriverDataType DriverDataType = db.DriverPrepare_DriverDataType.First(e => e.DriverDataTypeId == DriverDataTypeId);
+            db.DriverPrepare_DriverDataType.DeleteOnSubmit(DriverDataType);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 根据一个上级开车资料收集类别Id删除所有对应开车资料收集类别信息
+        /// </summary>
+        /// <param name="DriverDataTypeCode"></param>
+        public static void DeleteAllDriverDataType(string DriverDataTypeId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var q = from x in db.DriverPrepare_DriverDataType where x.ParentId == DriverDataTypeId select x;
+            db.DriverPrepare_DriverDataType.DeleteAllOnSubmit(q);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 获取施工开车资料收集类别项
+        /// </summary>
+        /// <returns></returns>
+        public static ListItem[] GetDriverDataTypeNameList()
+        {
+            var q = (from x in Funs.DB.DriverPrepare_DriverDataType orderby x.DriverDataTypeCode select x).ToList();
+            ListItem[] list = new ListItem[q.Count()];
+            for (int i = 0; i < q.Count(); i++)
+            {
+                list[i] = new ListItem(q[i].DriverDataTypeName ?? "", q[i].DriverDataTypeId.ToString());
+            }
+            return list;
+        }
+
+        /// <summary>
+        /// 根据主键返回一个开车资料收集类别信息
+        /// </summary>
+        /// <param name="cnProfessionalCode">开车资料收集类别编号</param>
+        /// <returns></returns>
+        public static Model.DriverPrepare_DriverDataType GetDriverDataTypeById(string DriverDataTypeId)
+        {
+            return Funs.DB.DriverPrepare_DriverDataType.FirstOrDefault(x => x.DriverDataTypeId == DriverDataTypeId);
+        }
+        /// <summary>
+        /// 根据原主键返回一个开车资料收集类别信息
+        /// </summary>
+        /// <param name="sourceDataTypeId"></param>
+        /// <returns></returns>
+        public static Model.DriverPrepare_DriverDataType GetDriverDataTypeBySourceDataTypeId(string sourceDataTypeId, string projectId)
+        {
+            return Funs.DB.DriverPrepare_DriverDataType.FirstOrDefault(x => x.ParentId == sourceDataTypeId && x.ProjectId == projectId);
+        }
+        /// <summary>
+        /// 根据父级Id返回所有开车资料收集类别信息
+        /// </summary>
+        /// <param name="superDriverDataTypeId">开车资料收集类别编号</param>
+        /// <returns></returns>
+        public static List<Model.DriverPrepare_DriverDataType> GetDriverDataTypesBySuperDriverDataTypeId(string superDataTypeId)
+        {
+            return (from x in Funs.DB.DriverPrepare_DriverDataType where x.ParentId == superDataTypeId select x).ToList();
+        }
+
+        /// <summary>
+        /// 判断开车资料收集类别编号是否存在
+        /// </summary>
+        /// <param name="DriverDataTypeCode"></param>
+        /// <returns></returns>
+        public static bool IsExistDriverDataTypeCode(string dataTypeCode, string DriverDataTypeId)
+        {
+            Model.DriverPrepare_DriverDataType m = Funs.DB.DriverPrepare_DriverDataType.FirstOrDefault(e => e.DriverDataTypeCode == dataTypeCode && e.DriverDataTypeId != DriverDataTypeId);
+            if (m != null)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 判断开车资料收集类别名称是否存在
+        /// </summary>
+        /// <param name="professionalName"></param>
+        /// <returns></returns>
+        public static bool IsExistProfessionalName(string dataTypeName, string DriverDataTypeId)
+        {
+            Model.DriverPrepare_DriverDataType m = Funs.DB.DriverPrepare_DriverDataType.FirstOrDefault(e => e.DriverDataTypeName == dataTypeName && e.DriverDataTypeId != DriverDataTypeId);
+            if (m != null)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+    }
+}
diff --git a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDutyItemService.cs b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDutyItemService.cs
new file mode 100644
index 00000000..0c494850
--- /dev/null
+++ b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDutyItemService.cs
@@ -0,0 +1,272 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web.UI.DataVisualization.Charting;
+
+namespace BLL
+{
+    public class DriverPrepareDutyItemService
+    {
+        /// <summary>
+        /// 修改开车活动责任分工明细信息
+        /// </summary>
+        /// <param name="pauseNotice">开车活动责任分工明细实体</param>
+        public static void UpdateDutyItem(Model.DriverPrepare_DutyItem a)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.DriverPrepare_DutyItem newDutyItem = db.DriverPrepare_DutyItem.First(e => e.DutyItemId == a.DutyItemId);
+            newDutyItem.DutyItemId = a.DutyItemId;
+            newDutyItem.DutyId = a.DutyId;
+            newDutyItem.Stage = a.Stage;
+            newDutyItem.Code = a.Code;
+            newDutyItem.ActivityContent = a.ActivityContent;
+            newDutyItem.Item1 = a.Item1;
+            newDutyItem.Item2 = a.Item2;
+            newDutyItem.Item3 = a.Item3;
+            newDutyItem.Item4 = a.Item4;
+            newDutyItem.Item5 = a.Item5;
+            newDutyItem.Item6 = a.Item6;
+            newDutyItem.Item7 = a.Item7;
+            newDutyItem.Item8 = a.Item8;
+            newDutyItem.Item9 = a.Item9;
+            newDutyItem.Item10 = a.Item10;
+            newDutyItem.Item11 = a.Item11;
+            newDutyItem.Item12 = a.Item12;
+            newDutyItem.Item13 = a.Item13;
+            newDutyItem.Item14 = a.Item14;
+            newDutyItem.Remark = a.Remark;
+            db.SubmitChanges();
+        }
+        /// <summary>
+        /// 根据开车活动责任分工明细编号获取开车活动责任分工明细
+        /// </summary>
+        /// <param name="costCode"></param>
+        public static Model.DriverPrepare_DutyItem GetDutyItemByDutyItemId(string DutyItemId)
+        {
+            return Funs.DB.DriverPrepare_DutyItem.FirstOrDefault(e => e.DutyItemId == DutyItemId);
+        }
+        
+        /// <summary>
+        /// 根据编号获取开车活动责任分工明细集合
+        /// </summary>
+        /// <param name="code"></param>
+        /// <returns></returns>
+        public static List<Model.DriverPrepare_DutyItem> GetLists(string dutyId)
+        {
+            return (from x in Funs.DB.DriverPrepare_DutyItem where x.DutyId == dutyId orderby x.Code select x).ToList();
+        }
+
+        /// <summary>
+        /// 根据开车活动责任分工明细主键删除一个开车活动责任分工明细信息
+        /// </summary>
+        /// <param name="pauseNoticeCode">开车活动责任分工明细主键</param>
+        public static void DeleteDutyItemByDutyId(string dutyId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var q = (from x in db.DriverPrepare_DutyItem where x.DutyId == dutyId select x).ToList();
+            if (q.Count > 0)
+            {
+                db.DriverPrepare_DutyItem.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+        }
+        /// <summary>
+        /// 增加开车活动责任分工明细信息
+        /// </summary>
+        /// <param name="pauseNotice">开车活动责任分工明细实体</param>
+        public static void AddDutyItem(Model.DriverPrepare_DutyItem a)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.DriverPrepare_DutyItem newDutyItem = new Model.DriverPrepare_DutyItem();
+            newDutyItem.DutyItemId = a.DutyItemId;
+            newDutyItem.DutyId = a.DutyId;
+            newDutyItem.Stage = a.Stage;
+            newDutyItem.Code = a.Code;
+            newDutyItem.ActivityContent = a.ActivityContent;
+            newDutyItem.Item1 = a.Item1;
+            newDutyItem.Item2 = a.Item2;
+            newDutyItem.Item3 = a.Item3;
+            newDutyItem.Item4 = a.Item4;
+            newDutyItem.Item5 = a.Item5;
+            newDutyItem.Item6 = a.Item6;
+            newDutyItem.Item7 = a.Item7;
+            newDutyItem.Item8 = a.Item8;
+            newDutyItem.Item9 = a.Item9;
+            newDutyItem.Item10 = a.Item10;
+            newDutyItem.Item11 = a.Item11;
+            newDutyItem.Item12 = a.Item12;
+            newDutyItem.Item13 = a.Item13;
+            newDutyItem.Item14 = a.Item14;
+            newDutyItem.Remark = a.Remark;
+            db.DriverPrepare_DutyItem.InsertOnSubmit(newDutyItem);
+            db.SubmitChanges();
+        }
+        /// <summary>
+        /// 创建开车活动责任分工明细集合信息
+        /// </summary>
+        /// <param name="pauseNotice">开车活动责任分工明细实体</param>
+        public static void CreateDutyItems()
+        {
+            List<Model.DriverPrepare_DutyItem> list = new List<Model.DriverPrepare_DutyItem>();
+            Model.DriverPrepare_DutyItem newDutyItem1 = new Model.DriverPrepare_DutyItem();
+            newDutyItem1.DutyItemId = SQLHelper.GetNewID();
+            newDutyItem1.DutyId = "Empty";
+            newDutyItem1.Stage = "预试车";
+            newDutyItem1.Code = 1;
+            newDutyItem1.ActivityContent = "管道系统冲洗、吹扫";
+            list.Add(newDutyItem1);
+            Model.DriverPrepare_DutyItem newDutyItem2 = new Model.DriverPrepare_DutyItem();
+            newDutyItem2.DutyItemId = SQLHelper.GetNewID();
+            newDutyItem2.DutyId = "Empty";
+            newDutyItem2.Stage = "预试车";
+            newDutyItem2.Code = 2;
+            newDutyItem2.ActivityContent = "设备及管道系统的化学清洗";
+            list.Add(newDutyItem2);
+            Model.DriverPrepare_DutyItem newDutyItem3 = new Model.DriverPrepare_DutyItem();
+            newDutyItem3.DutyItemId = SQLHelper.GetNewID();
+            newDutyItem3.DutyId = "Empty";
+            newDutyItem3.Stage = "预试车";
+            newDutyItem3.Code = 3;
+            newDutyItem3.ActivityContent = "电气系统试验";
+            list.Add(newDutyItem3);
+            Model.DriverPrepare_DutyItem newDutyItem4 = new Model.DriverPrepare_DutyItem();
+            newDutyItem4.DutyItemId = SQLHelper.GetNewID();
+            newDutyItem4.DutyId = "Empty";
+            newDutyItem4.Stage = "预试车";
+            newDutyItem4.Code = 4;
+            newDutyItem4.ActivityContent = "控制系统调试及回路核查";
+            list.Add(newDutyItem4);
+            Model.DriverPrepare_DutyItem newDutyItem5 = new Model.DriverPrepare_DutyItem();
+            newDutyItem5.DutyItemId = SQLHelper.GetNewID();
+            newDutyItem5.DutyId = "Empty";
+            newDutyItem5.Stage = "预试车";
+            newDutyItem5.Code = 5;
+            newDutyItem5.ActivityContent = "燃气、蒸汽驱动机调试";
+            list.Add(newDutyItem5);
+            Model.DriverPrepare_DutyItem newDutyItem6 = new Model.DriverPrepare_DutyItem();
+            newDutyItem6.DutyItemId = SQLHelper.GetNewID();
+            newDutyItem6.DutyId = "Empty";
+            newDutyItem6.Stage = "预试车";
+            newDutyItem6.Code = 6;
+            newDutyItem6.ActivityContent = "机泵单机试车";
+            list.Add(newDutyItem6);
+            Model.DriverPrepare_DutyItem newDutyItem7 = new Model.DriverPrepare_DutyItem();
+            newDutyItem7.DutyItemId = SQLHelper.GetNewID();
+            newDutyItem7.DutyId = "Empty";
+            newDutyItem7.Stage = "预试车";
+            newDutyItem7.Code = 7;
+            newDutyItem7.ActivityContent = "大型机组试车";
+            list.Add(newDutyItem7);
+            Model.DriverPrepare_DutyItem newDutyItem8 = new Model.DriverPrepare_DutyItem();
+            newDutyItem8.DutyItemId = SQLHelper.GetNewID();
+            newDutyItem8.DutyId = "Empty";
+            newDutyItem8.Stage = "预试车";
+            newDutyItem8.Code = 8;
+            newDutyItem8.ActivityContent = "烘炉";
+            list.Add(newDutyItem8);
+            Model.DriverPrepare_DutyItem newDutyItem9 = new Model.DriverPrepare_DutyItem();
+            newDutyItem9.DutyItemId = SQLHelper.GetNewID();
+            newDutyItem9.DutyId = "Empty";
+            newDutyItem9.Stage = "预试车";
+            newDutyItem9.Code = 9;
+            newDutyItem9.ActivityContent = "催化剂、分子筛、树脂及干燥剂装填";
+            list.Add(newDutyItem9);
+            Model.DriverPrepare_DutyItem newDutyItem10 = new Model.DriverPrepare_DutyItem();
+            newDutyItem10.DutyItemId = SQLHelper.GetNewID();
+            newDutyItem10.DutyId = "Empty";
+            newDutyItem10.Stage = "联动试车";
+            newDutyItem10.Code = 10;
+            newDutyItem10.ActivityContent = "蒸汽发生器煮炉";
+            list.Add(newDutyItem10);
+            Model.DriverPrepare_DutyItem newDutyItem11 = new Model.DriverPrepare_DutyItem();
+            newDutyItem11.DutyItemId = SQLHelper.GetNewID();
+            newDutyItem11.DutyId = "Empty";
+            newDutyItem11.Stage = "联动试车";
+            newDutyItem11.Code = 11;
+            newDutyItem11.ActivityContent = "设备、管道系统钝化";
+            list.Add(newDutyItem11);
+            Model.DriverPrepare_DutyItem newDutyItem12 = new Model.DriverPrepare_DutyItem();
+            newDutyItem12.DutyItemId = SQLHelper.GetNewID();
+            newDutyItem12.DutyId = "Empty";
+            newDutyItem12.Stage = "联动试车";
+            newDutyItem12.Code = 12;
+            newDutyItem12.ActivityContent = "单元或系统模拟运行";
+            list.Add(newDutyItem12);
+            Model.DriverPrepare_DutyItem newDutyItem13 = new Model.DriverPrepare_DutyItem();
+            newDutyItem13.DutyItemId = SQLHelper.GetNewID();
+            newDutyItem13.DutyId = "Empty";
+            newDutyItem13.Stage = "联动试车";
+            newDutyItem13.Code = 13;
+            newDutyItem13.ActivityContent = "工艺系统气密性试验";
+            list.Add(newDutyItem13);
+            Model.DriverPrepare_DutyItem newDutyItem14 = new Model.DriverPrepare_DutyItem();
+            newDutyItem14.DutyItemId = SQLHelper.GetNewID();
+            newDutyItem14.DutyId = "Empty";
+            newDutyItem14.Stage = "投料试车";
+            newDutyItem14.Code = 14;
+            newDutyItem14.ActivityContent = "初次投料开车前安全检查PSSR";
+            list.Add(newDutyItem14);
+            Model.DriverPrepare_DutyItem newDutyItem15 = new Model.DriverPrepare_DutyItem();
+            newDutyItem15.DutyItemId = SQLHelper.GetNewID();
+            newDutyItem15.DutyId = "Empty";
+            newDutyItem15.Stage = "投料试车";
+            newDutyItem15.Code = 15;
+            newDutyItem15.ActivityContent = "工艺系统干燥置换";
+            list.Add(newDutyItem15);
+            Model.DriverPrepare_DutyItem newDutyItem16 = new Model.DriverPrepare_DutyItem();
+            newDutyItem16.DutyItemId = SQLHelper.GetNewID();
+            newDutyItem16.DutyId = "Empty";
+            newDutyItem16.Stage = "投料试车";
+            newDutyItem16.Code = 16;
+            newDutyItem16.ActivityContent = "工艺系统预冷、预热";
+            list.Add(newDutyItem16);
+            Model.DriverPrepare_DutyItem newDutyItem17 = new Model.DriverPrepare_DutyItem();
+            newDutyItem17.DutyItemId = SQLHelper.GetNewID();
+            newDutyItem17.DutyId = "Empty";
+            newDutyItem17.Stage = "投料试车";
+            newDutyItem17.Code = 17;
+            newDutyItem17.ActivityContent = "催化剂装填后的预处理";
+            list.Add(newDutyItem17);
+            Model.DriverPrepare_DutyItem newDutyItem18 = new Model.DriverPrepare_DutyItem();
+            newDutyItem18.DutyItemId = SQLHelper.GetNewID();
+            newDutyItem18.DutyId = "Empty";
+            newDutyItem18.Stage = "投料试车";
+            newDutyItem18.Code = 18;
+            newDutyItem18.ActivityContent = "初次投料、开车";
+            list.Add(newDutyItem18);
+            Model.DriverPrepare_DutyItem newDutyItem19 = new Model.DriverPrepare_DutyItem();
+            newDutyItem19.DutyItemId = SQLHelper.GetNewID();
+            newDutyItem19.DutyId = "Empty";
+            newDutyItem19.Stage = "投料试车";
+            newDutyItem19.Code = 19;
+            newDutyItem19.ActivityContent = "静态密封点热态检查及紧固";
+            list.Add(newDutyItem19);
+            Model.DriverPrepare_DutyItem newDutyItem20 = new Model.DriverPrepare_DutyItem();
+            newDutyItem20.DutyItemId = SQLHelper.GetNewID();
+            newDutyItem20.DutyId = "Empty";
+            newDutyItem20.Stage = "投料试车";
+            newDutyItem20.Code = 20;
+            newDutyItem20.ActivityContent = "生产出产品";
+            list.Add(newDutyItem20);
+            Model.DriverPrepare_DutyItem newDutyItem21 = new Model.DriverPrepare_DutyItem();
+            newDutyItem21.DutyItemId = SQLHelper.GetNewID();
+            newDutyItem21.DutyId = "Empty";
+            newDutyItem21.Stage = "试运行";
+            newDutyItem21.Code = 21;
+            newDutyItem21.ActivityContent = "运行调整至具备考核条件";
+            list.Add(newDutyItem21);
+            Model.DriverPrepare_DutyItem newDutyItem22 = new Model.DriverPrepare_DutyItem();
+            newDutyItem22.DutyItemId = SQLHelper.GetNewID();
+            newDutyItem22.DutyId = "Empty";
+            newDutyItem22.Stage = "试运行";
+            newDutyItem22.Code = 22;
+            newDutyItem22.ActivityContent = "性能考核";
+            list.Add(newDutyItem22);
+            Model.SGGLDB db = Funs.DB;
+            db.DriverPrepare_DutyItem.InsertAllOnSubmit(list);
+            db.SubmitChanges();
+        }
+    }
+}
diff --git a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDutyService.cs b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDutyService.cs
index 44711e64..6c2512d7 100644
--- a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDutyService.cs
+++ b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDutyService.cs
@@ -56,7 +56,7 @@ namespace BLL
         /// 根据主键删除 开车资料收集
         /// </summary>
         /// <param name="DriverDataId"></param>
-        public static void DeleteDriverPlan(string DutyId)
+        public static void DeleteDriverPrepareDuty(string DutyId)
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
diff --git a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanItemService.cs b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanItemService.cs
new file mode 100644
index 00000000..74690e60
--- /dev/null
+++ b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanItemService.cs
@@ -0,0 +1,131 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BLL
+{
+    /// <summary>
+    /// 开车方案计划明细表
+    /// </summary>
+    public static class DriverPrepareSchemePlanItemService
+    {
+        public static Model.SGGLDB db = Funs.DB;
+
+        /// <summary>
+        /// 根据主键获取开车方案计划明细信息
+        /// </summary>
+        /// <param name="SchemePlanItemId"></param>
+        /// <returns></returns>
+        public static Model.DriverPrepare_SchemePlanItem GetSchemePlanItemById(string SchemePlanItemId)
+        {
+            return Funs.DB.DriverPrepare_SchemePlanItem.FirstOrDefault(e => e.SchemePlanItemId == SchemePlanItemId);
+        }
+
+        /// <summary>
+        /// 根据开车方案计划ID获取所有相关明细信息
+        /// </summary>
+        /// <param name="schemePlanId"></param>
+        /// <returns></returns>
+        public static List<Model.DriverPrepare_SchemePlanItem> GetSchemePlanItemByschemePlanId(string schemePlanId)
+        {
+            return (from x in Funs.DB.DriverPrepare_SchemePlanItem where x.SchemePlanId == schemePlanId orderby x.SortIndex select x).ToList();
+        }
+
+        /// <summary>
+        /// 根据开车方案计划ID获取所有相关明细信息
+        /// </summary>
+        /// <param name="schemePlanId"></param>
+        /// <returns></returns>
+        public static List<Model.DriverPrepare_SchemePlanItem> GetModelList()
+        {
+            return (from x in Funs.DB.DriverPrepare_SchemePlanItem where x.SchemePlanId == "合成氨尿素项目" || x.SchemePlanId == "磷酸项目" || x.SchemePlanId == "LNG项目" select x).ToList();
+        }
+
+        /// <summary>
+        /// 添加开车方案计划明细
+        /// </summary>
+        /// <param name="SchemePlanItem"></param>
+        public static void AddSchemePlanItem(Model.DriverPrepare_SchemePlanItem SchemePlanItem)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.DriverPrepare_SchemePlanItem newEquipmentItem = new Model.DriverPrepare_SchemePlanItem
+            {
+                SchemePlanItemId = SchemePlanItem.SchemePlanItemId,
+                SchemePlanId = SchemePlanItem.SchemePlanId,
+                SolutionName = SchemePlanItem.SolutionName,
+                SortIndex = SchemePlanItem.SortIndex,
+            };
+            db.DriverPrepare_SchemePlanItem.InsertOnSubmit(newEquipmentItem);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改开车方案计划明细
+        /// </summary>
+        /// <param name="SchemePlanItem"></param>
+        public static void UpdateSchemePlanItem(Model.DriverPrepare_SchemePlanItem SchemePlanItem)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.DriverPrepare_SchemePlanItem newSchemePlanItem = db.DriverPrepare_SchemePlanItem.FirstOrDefault(e => e.SchemePlanItemId == SchemePlanItem.SchemePlanItemId);
+            if (newSchemePlanItem != null)
+            {
+                newSchemePlanItem.SchemePlanId = SchemePlanItem.SchemePlanId;
+                newSchemePlanItem.SolutionName = SchemePlanItem.SolutionName;
+                newSchemePlanItem.SortIndex = SchemePlanItem.SortIndex;
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除开车方案计划明细
+        /// </summary>
+        /// <param name="SchemePlanItemId"></param>
+        public static void DeleteSchemePlanItemById(string SchemePlanItemId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.DriverPrepare_SchemePlanItem SchemePlanItem = db.DriverPrepare_SchemePlanItem.FirstOrDefault(e => e.SchemePlanItemId == SchemePlanItemId);
+            if (SchemePlanItem != null)
+            {
+                db.DriverPrepare_SchemePlanItem.DeleteOnSubmit(SchemePlanItem);
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据开车方案计划ID删除所有相关明细信息
+        /// </summary>
+        /// <param name="schemePlanId"></param>
+        public static void DeleteSchemePlanItemByschemePlanId(string schemePlanId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var q = (from x in Funs.DB.DriverPrepare_SchemePlanItem where x.SchemePlanId == schemePlanId select x).ToList();
+            if (q != null)
+            {
+                db.DriverPrepare_SchemePlanItem.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 是否存在方案名称
+        /// </summary>
+        /// <param name="postName"></param>
+        /// <returns>true-存在，false-不存在</returns>
+        public static bool IsExistSolutionName(string projectId, string solutionName, string schemePlanItemId)
+        {
+            var q = from x in Funs.DB.DriverPrepare_SchemePlanItem
+                    join y in Funs.DB.DriverPrepare_SchemePlan on x.SchemePlanId equals y.SchemePlanId
+                    where y.ProjectId == projectId && x.SolutionName == solutionName && (x.SchemePlanItemId != schemePlanItemId || schemePlanItemId == null)
+                    select x;
+            if (q.Count() > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+    }
+}
diff --git a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanService.cs b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanService.cs
index 63bfcb38..a48c89dd 100644
--- a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanService.cs
+++ b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanService.cs
@@ -76,6 +76,14 @@ namespace BLL
         {
             return Funs.DB.DriverPrepare_SchemePlan.FirstOrDefault(e => e.SchemePlanId == SchemePlanId);
         }
+
+        /// <summary>
+        /// 详情--开车资料收集
+        /// </summary>
+        public static Model.DriverPrepare_SchemePlan GetDriverPlanByProjectId(string projectId)
+        {
+            return Funs.DB.DriverPrepare_SchemePlan.FirstOrDefault(e => e.ProjectId == projectId);
+        }
     }
     
 }
diff --git a/SGGL/BLL/WebService/CNCECHSSEWebService.cs b/SGGL/BLL/WebService/CNCECHSSEWebService.cs
index f1da6f0c..e96194bd 100644
--- a/SGGL/BLL/WebService/CNCECHSSEWebService.cs
+++ b/SGGL/BLL/WebService/CNCECHSSEWebService.cs
@@ -14,6 +14,8 @@
     using System.Web;
     using RestSharp;
     using System.Net;
+    using System.Collections;
+    using Newtonsoft.Json.Linq;
 
     public static class CNCECHSSEWebService
     {
@@ -1262,10 +1264,10 @@
             {
                 try
                 {
-                    CNCECHSSEService.HSSEServiceClient hsseC = new CNCECHSSEService.HSSEServiceClient();
-                    var upCheckReport = from x in Funs.DB.View_CheckRectifyListFromSUB
+                    //   CNCECHSSEService.HSSEServiceClient hsseC = new CNCECHSSEService.HSSEServiceClient();
+                    var upCheckReport = from x in db.View_CheckRectifyListFromSUB
                                         where x.RealEndDate.HasValue && x.CheckRectifyId == checkRectifyId
-                                        select new CNCECHSSEService.Check_CheckRectify
+                                        select new Model.CheckRectifyItem
                                         {
                                             CheckRectifyId = x.CheckRectifyId,
                                             CheckRectifyCode = x.CheckRectifyCode,
@@ -1290,18 +1292,37 @@
                                             FileContext = FileStructService.GetMoreFileStructByAttachUrl(x.AttachUrl2),
                                         };
 
-                    var getR = hsseC.DataInsertCheck_CheckRectifyTable(upCheckReport.ToList());
-                    foreach (var item in getR)
+                    string baseurl = SysConstSetService.CNCECPath + "/api/HSSEData/UpCheckRectifyTable";
+                    string contenttype = "application/json;charset=unicode";
+                    Hashtable newToken = new Hashtable
+                {
+                     { "token", ServerService.GetToken().Token }
+                };
+                    var pushContent = JsonConvert.SerializeObject(upCheckReport.ToList());
+                    var strJosn = APIGetHttpService.Http(baseurl, "Post", contenttype, newToken, pushContent);
+                    if (!string.IsNullOrEmpty(strJosn))
                     {
-                        var newCheckRectify = db.Check_CheckRectify.FirstOrDefault(e => e.CheckRectifyId == item);
-                        if (newCheckRectify != null)
+                        JObject obj = JObject.Parse(strJosn);
+                        code = obj["code"].ToString();
+
+                        if (code == "1")
                         {
-                            newCheckRectify.HandleState = BLL.Const.State_3;    //已完成                              
-                            db.SubmitChanges();
+                            var getIds = Funs.GetStrListByStr(obj["data"].ToString(), ',');
+                            if (getIds.Count() > 0)
+                            {
+                                foreach (var item in getIds)
+                                {
+                                    var newCheckRectify = db.Check_CheckRectify.FirstOrDefault(e => e.CheckRectifyId == item);
+                                    if (newCheckRectify != null)
+                                    {
+                                        newCheckRectify.HandleState = BLL.Const.State_3;    //已完成                              
+                                        db.SubmitChanges();
+                                    }
+                                }
+                            }
+                            LogService.AddSys_Log(CurrUser, "【集团检查整改】上传到服务器" + getIds.Count.ToString() + "条数据；", null, BLL.Const.UpCheckReportMenuId, BLL.Const.BtnUploadResources);
                         }
                     }
-                    code = "1";
-                    LogService.AddSys_Log(CurrUser, "【集团检查整改】上传到服务器" + getR.Count.ToString() + "条数据；", null, BLL.Const.UpCheckReportMenuId, BLL.Const.BtnUploadResources);
                 }
                 catch (Exception ex)
                 {
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index e69de29b..c0c6b942 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -0,0 +1,19 @@
+
+错误信息开始=====>
+错误类型:NullReferenceException
+错误信息:未将对象引用设置到对象的实例。
+错误堆栈:
+   在 FineUIPro.Web.TestRun.DriverPrepare.SchemePlan.btnOut_Click(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\TestRun\DriverPrepare\SchemePlan.aspx.cs:行号 230
+   在 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)
+出错时间:01/17/2024 15:45:21
+出错文件:http://localhost:8579/TestRun/DriverPrepare/SchemePlan.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:01/17/2024 15:45:21
+
diff --git a/SGGL/FineUIPro.Web/File/Excel/TestRun/开车方案编制计划.xlsx b/SGGL/FineUIPro.Web/File/Excel/TestRun/开车方案编制计划.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..a5f6269c2acb8ef702e3cf558c819fe0d0cddd15
GIT binary patch
literal 10691
zcmeHtWl&t(wr=CDK@)<z6WkpdcMtBaL4s?r06~Jg69`UlcPD6qgy8NH{59-zZuTZQ
zRr~#TuWsGD7e%k?T0Op=J?1xj%1c2&VgR54umAvn2#_Clkr)650AN4^08aq(U|Pbq
zHcrMiPP)o&cE*m{^sd%cgjrv}C^G=ypwItv{ZG@tpmLv0J0oh7+7`b^vudY6Zc!0B
zhZAQFa1@2{P=FSF_6QN<wmC*#zVI`U1@E;)Y?p1aDaEq2hR8EmvlN*w!o4t9tF@}~
z0p-RKo!95YLW-&%+BJY($nxRh(`tQI>tG~0)=Ze3@4TbXEAb=)%a8Rg2HFD^(fEUM
zPpGvD$$Ir$yeXJX;b>0_+EKGt;IJ&T<xd({r`^dM4Mk6C?@F^I1CN>+6N#~?*;Vfd
zH|x6EjWV=r=yAEk2n5Ur!3t;%2oRZrs8Gw9FdSkV%Qy8{M4n)7sKgBtehMUY23&0u
znxLeLOz5#=_U{J(8^Ft$CkwyvZur&_EdZd>Om{7Pm`aOHed-Qp+DFs0-N^~)i`Rxr
z=u;&pgKCw#@txS?d}vtUhO<}NUts}MvROCMOo6aQiwPP}*s;rwbf&S4J)b#G*=fEd
z@zR1u;<C95iP&p6vUSt@2);peC{fY)!}%s+o-N*xof&)a+86K4uDU++T?OB`cshto
zcXto~`M+3XwF)E2Dd>qb$lwqF!(h4&##W9D^!KlXS^fW5;{O;6438d>?O;Ug-Ul`c
zuUu`}0AVw88>E2^M9TQBq<aL_Z?j1S&d&lM{3H!$$IjMA__Y@H*36X&@C+DaJL)L~
z%b5+_r!8Dd(p6D142Vt5F?yax;OVQ)FIefi=ENo&OkWjLgoQn=kG&=_V0kWwfpECv
zko%5Np<mx@EC#p0crJF8H>d?)o{nd-%>ow29j1uylINo06N`+kE5n+nLA-3ZK-v@T
z0q0d=6NJK%*@7gY0SSN1<CJl<zAIuwh&1xAFXc||YB=nPr9wu5i^n|QLLCLRw|(i;
z%?f`s4f8DJ2Yi<?`k~*}g`%wcTdps_-B5yqqR#{b0Pqw53+8IY@CV&pY#l5OY;7&?
z<IlgS4|z|0&}aX5UyU&%77wKHZ}K1Ww2!tij^%0!7cA8}2aqc)jdrrVKcleaj}fjH
z=%dfX_9wme<R8ty`JTVui4AR$suD#;1zVN-L35V!2S*bhk3Zp5&F9q00zCmgVSDdS
z-W{@z*CKhRq*<Y4P(fezb8<fGl~UQ`Tc=FWpClRLKHYrfHigvBBlGFS^`wtM9#uq~
zpItE<p{#%8@SSBty^WNI{i<o?`%?8@TkK&YRL;<?Q9_yoP12q|@{mr#(vB7OpuTv$
zif0{0QjD{#`n?-IliY6-gzAeergZ$=G%<tT&<A<JBfdS2zFAH>!;^z!*fXT+aryct
zW!~Tr;dkB=g_o+-6vPT&khequQ3J%FKXWHsQCqH^5yO-Hke|gf-jgvHl?^>xOb0O}
zc;r=+A(D1O)pLLEed|8dY!trJx$(+zN4Xkx{AUu#dc~vE`F)gmkjjO1@(n4?wrTr&
zROJy=!#S!^<4@G<X>Dw=n%J)7O3opXVu#FkUvfthYfX(Za(||yY%HuYPv{uiA)bAz
zH#Y_N_)g(z&v=2p&{$>1+;xwzS{&tfg?Md<{!|%6;2L9diKwM{c|kzHt{X}F*Rwd*
zgeyv_cZ2m5^mqp;CLCM%UZ{DN1YATnyQFEO1+}zwY>?W|6ROc*RMX0+Bsr9eV{H5p
zQ1*$^P0YDYzg;@ifWN-7UKV$_Mh)HO%U3@&Z)L{2Z1slSvp7lA7lb$mH&EjyjWNe^
z-{0ux!3d2Eh$$%BO=iF)fwl=mAYya$Z7p_PdhS&?PQ$ts#&x5_+pI{^T+l<L&DaAZ
ziy>28k3=ONBJZQ63~I^$0n+-f5iFSEk|`LJPbxpV&nX}F#L3Lq+L+<tmFeE5cQj;d
zpNZl$lN=I=x!YP(I6oDCRWwun%xqk&Tx(+4m3JZawX-QJv+UM0i%1|a*zdKV&`S=&
z3`H7WkqcHT(OlpSLL+l!!$Qb3DHR%Q0ZNF=nOh70TI%5{%{g%pa&S~^4_&Eq`4$oS
zm50c3#_Igj6Z&FzAT?ej<1&-E8#8eeP4a%TBd%>hln5l4CoQ|(079H38#U%;$BXya
zZbAmG>}$mB@c5$gxNsh@9we$7g{srkXnEyt4Di5alb4xJ;a=Y^%Q3XPUa>ZrYd{p~
zl-z<!4{2VL!9(|dE@SbO$h4vZlB>0N)i(o;A1}(iUl>seia}Fn(xb6|Z54h27?PkV
zq?NIqC?^?@9!^dpmIoVDH>z2>&{&mv%nr!IvY)s4G+wfLjR?5nQ@40UbyR#lWw{$}
z3TD(of3&CkY_dL#;Xqe=wC;<|r)NXT*aH(jJJXloUQP9?-!$zHpp6dSLU}YbO>P!*
zx<XX^sD|>`S9C1dTSB5VVo9UTcqQQ86zh(R>sX@%uM6|zHEZCALKKplvpJd}{s-ea
ztnUpkPXHOdh%`@0SfzS#uA;i1;~_zHX#y4qYY)2VFC6qG282FivnbH*-#`jW3|=&O
zo$YR$%8hQDMn>-O^VZ*WjQPWepSOH!#A|<!2P4|9rt5ulg-ww4EzRR%>$~Zyt48PD
z(Y*MG_iYs(EGEnJM%Q|zx98=LuIxx%uj4YvX0n4aSc1`Dpp!pdmM6ZibvM(;H6zMl
zF(z21SCn?JjZ*3^DjNXXK}MR6>X7ZmS@0xr+=H!?kJ*;|7)qj2q`C+sFtr1mmW~Qr
zK9-uQZ5{sRc(DlB<HR-u%l<FEJjdhC+?9Q@k))x>)x00jso)s-UH!XHrwGwagd8kY
z`5tm^gsw{=L+y%T;GX<Mchv+L1eX)Kxonj%N$^1Npb2dCa`OCa!H`Dc<m^hTsF0wZ
zYSy(6W6xW)L*?%U;i~}g;*EoC^+03EGt+j4rFuod9Ef&~t%%@QV-|L(87<gLR>Yek
zmYoJGtU6%kMo#$pt3fxkx*>{GRB;L18oA}NU{5(&LQ$r#%SDLI1M~1>Bd9QV3`pnJ
zk|}oSbFemJtqSI8gqK6g8|p&Y&X=|#%lwwz;X>>+oCh_ypBm|AlKLeL*3}Vog08UH
z7OZ*Rp2MzOE_EN*>^JW=EO<BX(|=eUcb;|g4_x^028J6unTk`Bi!_qT(3910rJlvH
zB4Eg1!e3OzR5qBDpM{LbLngVw9|4k$1!#8)rlQZ^2{$;yD#r|G)Xx<~`5k@O*`zM^
zQ+G$o$DO{i%n`&I0${Q8MK68n*6NN~R3(#^tln^XVus4lVpY2;L#}k&4m+CaxMZrP
z=1_r&W-19CJFY>k*;CrJg#aqZwjFRC9e?I}EF{w>gT273d7D-Zb!m)YW|0@2B+=c#
z*(RLqBsj(QG;1#a4*8^FmnklO)9{~@l6G~YoRbJKyC&m<2eQu9vSN)7cqHp>BI8KH
z!n*nloMw)a-o^#J@kps^WWuxjZW${uk&A!Lh_L9;tJa=(6Vhc><bgkAVv?W*$y!@j
z=B3Lxvk4IrW$|oaG%v_4E)Nh^P5R+Z5@PPP4)lz)Hw2yPG!gDC6J2Yhjai?ow1*0!
zv%cunFkfCttQ;oVjh$0)kQMbAQ-E$h^$c?sx($W2_$Z29Twas4PTdeEUHuZ&`?fEy
z2BT5)cU9xfRQs@Owm7EScrYg*W+h*-cc;!{C>^aENiw~?GtJw$f&7S|D$WJY_i`0J
z+^MOChhDii6M>BA)EyieW}KT)Ymo~}M_92fu;PND*Z0=ea`=eR7%88xS`LDgaz~sR
zBVb2R>%|ur@Jh{k7mfF{#zrrSGCoQde-(BRm=QQ{Wo`Q8P8p!gK2K^50qw$bH@9Bp
z7vziY5PG_H66LX9&3fP>$5)fkM)?UP*_Zs-`=deMM~h7)x0-V-q%npyLsi}n@TjUY
z@JZ%hS~B5H=PayyG|OCb-%-IRysW~(I`*aXl_JQwYrPc@90`^%Y|2Fb!FQqx*}`gO
z62%rZiM_Mv>*QY*CXAD^lO;nw)L+l`Jhf`NV(2o3V*ceGld0v9?2~<FE^dP1m-e!B
zY5A2(DBR68mQvbC?|5~x%2<YxUyw7dnU*Y}$a%P8gEt|mT`T3~NRa=~kkG^7y~;z*
z_)#JvTz>%r3QNBRE=jQd8v{@>AqEO-I6spKM>At%Cr5^d+l%|?6&@`k2TH<%_JP-L
zdR?X>Z1bF9nPhf+0&wh5N@m5X>{ndFcc+(~5oMOz>26=Ao=a5BmVRVS?;U$LqR%7Q
zmcdZq)I9wC)Y!`bi9GZ)*SgOT`B}IfH!olRR3|~XAVxMk-`Z$!fJAg>R@-nl8q|qq
zVK6t%Q-{>fR<i;90?U|jmL_SgZJr$r@@oR5B5Jk8@KBXEI?lx5C74a#Rxg7Yha~f>
z7ozlw9crHmzZeRtwnd&kT(o+Py)Q!GsjsjWbym`szHqU)6e1H6r(Jy{y$$2^iX?RB
zTFuj>Ys=LvHnvu1mgea5Ktx+FIVGRm`HHvQxntYZ53@RFz9cM~NhxtPJ=c8Rl)(0=
zCcv>Q@x*Snn0}U!l(=a|GVrV|au3}YQ@RYyZL_BS8XB=&$qJ$b54^nW6?op*wd%gb
ztcD%u#<;*8)kLR$5QS{hK^C45c?-YZCDQNqh1>dtR2yhNgg|>k^2@&bQ87I1&O>hT
zP%i{TwuOQcKhblDTVYrCn5jTSVI_9rT9tJOgUhebv++^q7&q>fc*d=(t9B!+Y{^$V
zh0jco-_cIgg9ok{Vw;s6xPPT<5iIA}n!|vj<B8HAr*BSzkd>7T>4{RuL?{nbAicrq
z@ap_h9sySv#kclFBE*fc?;`BkXmOE+^^q=26@zT`KJAL9nm-q>qQ>n`geL)yO?JyL
z@Mt7Jf-_2wFAK=oE4q8+V<5Qga+YT4i42)%JveZD2KPG+Jn5u;(*Ace@W9W1YXDR!
zpo;7VUi;6ulXAb24<*x;B$_6_0f_3%W}QizeImQK+L#Ftis&$0VAS^3z&;HNG$ckS
zu@N8&WD!ZC^+@HbDa}ylLGqFa!1~xb+At(_9ugL>xx{IrIw@qOkJV?}ZI@twTC5~i
zWF&2Ts%V%fefE7;&dgb+l6|!lVlGwbIW)p5V^xOi^vn44hH;K=pM9$9;(HbJkwxoq
zW&wG7RdxpgKq?SFOK`cwgA3mtoOg5qRfE48Crc(=^xske^M4hMAQJqc0^bJ}Py{Oa
zt-cf@oMyWLsOSt3->V?^;%ZAhSt#;e1-qN>X%pC35h1iYuOQ(2^7$0Y4!jz6bOb;w
zn2&`8vEciJHTy1&tgJ;yPlATZ0}BY=>hmw{sON_(_eJ&Z<aDD;JKyesCkc=9Bp=O!
z&9@hRYzlPPJ<qU-d>Mb|lCK|(Khoz7VnNS?3fzR>y^i|uHSV4TtXk_7H)wFu(@9;&
zdmsn(s|x;xe|q@w|M;i>zy1lGXdllU6f=;Z{$t#D@J!*#12(gasEybg{HTp;r5q84
z>d1->f{v8(ES@R2=Ei96fbVm5b9BFDlF~##<TL?S9L`v|SC+QQt!E;NV>DNJ-l7i!
zG3#S3VvY&E+42o?IO-HAvS=y{r}rLySiN!yYpOx{NPdKf7CYd!+mzT-PGeya7*<6T
z7$Z5W>T0!1?%W+s$(>&lQc0TFT@n>~j<$B@ZLm=k4OQ~0+*;y-FF04sbz<Mb98Z^C
zGNf`8wNiQYnk%)G8J_`Ldo4ZsY|m_{v9={U2wsj1c9E9Fx%5;Ru+Sb$n6(Wc%A#zX
z8w*V$Ur*0lTyu$skRlE4LG0NUu1SsvEqx!S9AdrPvUy_~o&1$#m$VkU9t=x&s-F>Y
zSo3gZnp8@6-2-dr^CoGc$$AQ=*7~cf5Bxxw^9817c!%H4*JF-1h?CRq1`e(4I=$@%
zD<~7ShsjN`ZSzwQ(|(|&ZSKg7)Y{gNSkX1A(-$u=0|DCHBz_s6IkTXg(`KJvv`dHj
zG$S7j!__ig&A-s-<Q~;U432~mA>^nnmPOho5e}#BR&4!dPDLfQz<gI93lJ|)d7GO<
zk=rO{#DMl;I=C_(mhysSz)0j|@|=1{!n)6ftC~x7qXb?NLL&S0!p{jlv<G5ibfWe^
z2Mg6IHx5M&Oyq*XUrk^$PPO9$T8?RFP%~`9yZ-VZ>KutIgkh`FJ)7O?&EnCqrn9I$
zeYIs7!a=eS!Ujo8?-@k<{a#xnW>8>_@s7HVX0|4?@pjpCw5d8(1)`L<-ojLenpl&H
zy<21zjx$@DF<3`$nwhQGck}3d?+pr&zq$=8Ei(;B&=W<_KgJ*7)6q=d!PrR2$-&&l
z)bZY5T17F*LNK9<x|8nd$;dVO2*7@kMS}~807ur_<<gMaKCDO+U4f<&kPucJ7l6Tl
zh4fqAA)f;m7Ld=mK0Zyq^%&!If#POXDZ?kTaz@vKR!Y~v19EWk&CEbx0S)sIBE{NA
zAvcOnS<%4D6S@eAD5%dlQOs>pke};54VV3<CaV-X>GP)I1s6gc(+YfZ9BIRxd04BW
zE{Vhpm})j}iOjwl4O%gJ4%WF^*m<(^<!7BpND8uko-@K^e3jz;cgW0ev#n<8-3}Y>
z_}*z?A0h7yXgP<rYjOF#pWJH4&zU%Iws@-V4t>j`aTuBx<xZ-q%#ZxCtQ*lIGeH5;
z$*)=yi%H9H0vWY6$Q6UKlKak*qm!GJ@q@YsRfa6)7*U(CFOh}LySL{_S-PCfP!IyK
z;3YEEO6X?6Z*U}ZrZ~^13<<J6r8#cSvW)g@0FQL_us`_<F`Ny$dNt#El2A;;w2h@%
zbi_*Ad(^ZC_rJuHR;9XiZSXuqCov46g;k5rtIdYiH62MO>vm3An26Pcq{@-7x3)f}
z4wcqX5*$plC<tK4{p_bM{|YlvOi2+3o7A;Rr-YtFFriaJk=h)oUxmgxl;O4T`vmSP
z3Ou_mj{fME_POr@PXL`-q-ZRzJRWyP$31H6D(G#l*u|Cvs!yx|CcRahE^H_jD45dJ
zyW#JI(aNNAOXuRf)lJt&5v^Z0N_DXzD|qD;<}dRnI=IP39^8#(rqE6;pEE$Lw{j40
zmOG~agx|AtY8I_xVN48s(uN3+5|C$4qWnSUs+Qz*cxiyOxSX*ky9thEpqKptPg<kh
z+&t6IL}hnDmGxkb$}$d+sh6V|ZHJmoWZ>EWR41KD#F+i+$Tyl;rFv==k)o9DIW}#0
zfQqFJw&vq7#?Io{7~f2Vqae%KVn5_T-NV_%m@gb+L{rn=Os9yb7NS)k7;wDR#Tb)e
z1oyo-+D}qlzKCvMzIi?4b6LzA^gPZ|?4l8P+cagI=lv}Lc17i^C$7ciIFT1<=1&)_
z_0jhd+>s2(ci&RX<+R|FFG(MRO-fdB16iJpZDywWdEDL!ovkBMaFfiCynf3fuooeH
z*l}}HYMXAFy-*#lMc&a?&x%JvXlkF(Tkqg*+lTC>AJJ`yxo9OQ_1VFl+e`Y8v?U+P
zvTJhV)OR=TluD7OZ-4FvRrj)?YrpYM&ZOnHMh!I(E-4P8r4{JuJ%K^=v;$eQld*%6
zv6IuiSwDXNg5JQ~#vlWgv4XK|PCucwwRohpwYL?HjSi~Uz=#8k0vE>vM-f-jhcPZQ
zSm+8krjwQ!O#_%{4bIslK)-{G=HN{LebH}B<^O&yO#hA6!u<biEr9&SzWbU*0pv!|
zK;sP~TSIvVTRTSvLt6*qd#_8F_0Lq}o>Cssx>6mC7+v3>T7>)DlT93l18X4ScsWsb
z<UJ7j=2fk3qeL1!-N&6jJVzwh=cQ<I-y{2SM7X^HQ~aT-A5B6L!*@wj*&;q$rY@8~
zeuYQLZ&Fh*B4Tm0qPD58HuI&HYxP&3Q_Nb*sMzee6|?=OOdRfJn7)_jc+|mK)?~+-
zRoqrMcLv<8F)U3z=sZsbndiU_nNi2!sDAjce5=_5_!$-m`W+$11T6BG!qCi5!lb@%
z=<g?xnc2i}8N_PDhB<Fj@h>+|%1Lx)67urnpJK3`FS5`5s%0-AO3ty0l`vh?dr%Ae
z=0oD~w%xKd)Y2i&2@P*sLoF|)2nP5l-=2nBIv;O5jdB%x__(Na9vP97&_=jN4GF`-
zC*R8;9;DlNj=C@<^cc6q;Y}++)6HO4=#x4Ie!<^QMSwid*|I^z69ZLJsDCD&zMb7a
zyt`-IA6H6Do5eFG)S&&q#*Qra;_4@oOqzj9q${I}{;6}AyTxkCG;rn>GoJ5tUQ?bR
zz215V<2&><)8_7lvdqUQ{NKV!?W?V=ri7%s8~kJ_I0stIb)SBsnz^|=yG9y7r&goh
zevV-U6QbQ$sb+xd=@SgCD27FkSuBR=I2`jaQ^8!Qf+Y8-Tmfi4XQ!(o)=@nzhs3c`
z$>TkwAGRn-InvP<g%oj&bvIpgQok&PvaL<1N3{^7_f{3C)PF7}p6(I&Wk}T@(}Na1
zOUu_Q6x!tlwns{6oGKQU5iO1J6Id_WU~c*O&+q#?Nkzksu~;q>$c{s%*bKj9OOAfW
zC{`Jxd=oHPjU+)Z8^zeazOU<j`{R0hfW1wEz`~Qm=6TPWqRt5tMhcrVGz1J>et@Mv
z*5@}Cg~Yc|KMWA(m=S9shKrzEHxu>+zDiYkOF?Y97J12ap8J`7PtKT&2oOFQu8rK}
zE54}~n)%jdu25`&nVDlbyWQhgn|&%in@DT1$|k?(ev46$eaz^Az?mxJz;z@1Wg3#-
z3vdA%9{rJ&fq~P3($?P}So-%y{`>x$<4f{Ve+BsK`HFuF-ru7^*7B#*7LNu0I;{S)
zpciP^^`A%Ak8vK4EPo=kg3e?;8el#aemq<IDXa|tApCgJ_88!C58)>O654-#`!5~O
z$0(0Gaz9aW(I2Dywm<h6@Nt9dCtyBkg!nI|{A*c%0{q$TdJOouUGx*M2vh_8N5G%W
zqsM^%S#c$pj{zSR`T+G9<#DUv=dwhxe~a?aICzZmxT5=svV!}7@=Ja97~yes^Aq7I
z$nZew`C02c7JZ!U{S>Wx{vi5y^3cBzDvJMiKpzsyzYjY0w?H2<!^fb1P3nIBcmP0~
r008(U#d|FN*U<cD@hPG|iT^85%S%Cld<y`84*I)=1OQ4&@8A6&rwhuH

literal 0
HcmV?d00001

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 15deae93..4a671812 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1723,10 +1723,13 @@
     <Content Include="TestRun\DriverHse\RoadMapEdit.aspx" />
     <Content Include="TestRun\DriverPrepare\ConStudyEdit.aspx" />
     <Content Include="TestRun\DriverPrepare\DriverDataEdit.aspx" />
+    <Content Include="TestRun\DriverPrepare\DriverDataTypeEdit.aspx" />
     <Content Include="TestRun\DriverPrepare\DriverPersonPlanEdit.aspx" />
     <Content Include="TestRun\DriverPrepare\DriverPlanEdit.aspx" />
     <Content Include="TestRun\DriverPrepare\DutyEdit.aspx" />
     <Content Include="TestRun\DriverPrepare\SchemePlanEdit.aspx" />
+    <Content Include="TestRun\DriverPrepare\SchemePlanItemAdd.aspx" />
+    <Content Include="TestRun\DriverPrepare\SchemePlanItemSelect.aspx" />
     <Content Include="TestRun\DriverProgress.aspx" />
     <Content Include="TestRun\DriverProgressEdit.aspx" />
     <Content Include="TestRun\DriverReport\DriverRunComplete.aspx" />
@@ -15530,6 +15533,13 @@
     <Compile Include="TestRun\DriverPrepare\DriverDataEdit.aspx.designer.cs">
       <DependentUpon>DriverDataEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="TestRun\DriverPrepare\DriverDataTypeEdit.aspx.cs">
+      <DependentUpon>DriverDataTypeEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="TestRun\DriverPrepare\DriverDataTypeEdit.aspx.designer.cs">
+      <DependentUpon>DriverDataTypeEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="TestRun\DriverPrepare\DriverPersonPlan.aspx.cs">
       <DependentUpon>DriverPersonPlan.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -15586,6 +15596,20 @@
     <Compile Include="TestRun\DriverPrepare\SchemePlanEdit.aspx.designer.cs">
       <DependentUpon>SchemePlanEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="TestRun\DriverPrepare\SchemePlanItemAdd.aspx.cs">
+      <DependentUpon>SchemePlanItemAdd.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="TestRun\DriverPrepare\SchemePlanItemAdd.aspx.designer.cs">
+      <DependentUpon>SchemePlanItemAdd.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="TestRun\DriverPrepare\SchemePlanItemSelect.aspx.cs">
+      <DependentUpon>SchemePlanItemSelect.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="TestRun\DriverPrepare\SchemePlanItemSelect.aspx.designer.cs">
+      <DependentUpon>SchemePlanItemSelect.aspx</DependentUpon>
+    </Compile>
     <Compile Include="TestRun\DriverProgress.aspx.cs">
       <DependentUpon>DriverProgress.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverData.aspx b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverData.aspx
index 967d1916..58d94e0d 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverData.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverData.aspx
@@ -10,59 +10,76 @@
 <body>
     <form id="form1" runat="server">
         <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">
+        <f:Panel ID="Panel1" CssClass="blockpanel" Margin="5px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="开车资料收集" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="DriverDataId" AllowCellEditing="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="DriverDataId" AllowSorting="true" SortField="Code"
-                    SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableTextSelection="True" OnRowCommand="Grid1_RowCommand" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
-                    <Toolbars>
-                        <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:TextBox runat="server" ID="SDriverDataName" Label="资料名称" LabelAlign="Right"></f:TextBox>
-                                <f:Button ID="btnSearch" Icon="SystemSearch"
-                                    EnablePostBack="true" runat="server" OnClick="btnSearch_Click">
-                                </f:Button>
-                                <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnNew" Icon="Add" ToolTip="新增" EnablePostBack="false" runat="server" Hidden="true">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <%--<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                <f:Panel runat="server" ID="Panel2" RegionPosition="Left" RegionSplit="true" EnableCollapse="true"
+                    Width="300px" Title="资料库" ShowBorder="true" ShowHeader="false" Layout="Region"
+                    BodyPadding="1px">
+                    <Items>
+                        <f:Tree ID="tvDataTypeInit" EnableCollapse="true" ShowHeader="false" ShowBorder="true"
+                            OnNodeCommand="tvDataTypeInit_NodeCommand" AutoLeafIdentification="true" OnNodeExpand="trWBS_NodeExpand"
+                            runat="server">
+                            <Listeners>
+                                <f:Listener Event="beforenodecontextmenu" Handler="onTreeNodeContextMenu" />
+                            </Listeners>
+                        </f:Tree>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="Panel4" RegionPosition="Center" Layout="Fit"
+                    Title="中间面板" ShowBorder="true" ShowHeader="false" BodyPadding="10px">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="开车资料收集" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="DriverDataId" AllowCellEditing="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="DriverDataId" AllowSorting="true" SortField="Code"
+                            SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableTextSelection="True" OnRowCommand="Grid1_RowCommand" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
+                            <Toolbars>
+                                <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:TextBox runat="server" ID="SDriverDataName" Label="资料名称" LabelAlign="Right"></f:TextBox>
+                                        <f:Button ID="btnSearch" Icon="SystemSearch"
+                                            EnablePostBack="true" runat="server" OnClick="btnSearch_Click">
+                                        </f:Button>
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnNew" Icon="Add" ToolTip="新增" OnClick="btnNew_Click" runat="server" Hidden="true">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <%--<f:TemplateField ColumnID="tfPageIndex" Width="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:BoundField HeaderText="序号" DataField="Code" HeaderTextAlign="Center" Width="150px">
-                        </f:BoundField>
-                        <f:BoundField DataField="DriverDataName" HeaderText="资料名称" HeaderTextAlign="Center" Width="330px">
-                        </f:BoundField>
-                        <f:BoundField DataField="Remark" HeaderText="备注" HeaderTextAlign="Center" ExpandUnusedSpace="true">
-                        </f:BoundField>
-                        <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
-                            TextAlign="Center" ToolTip="附件查看" Icon="Find" />
-                    </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="10" Value="10" />
-                            <f:ListItem Text="15" Value="15" />
-                            <f:ListItem Text="20" Value="20" />
-                            <f:ListItem Text="25" Value="25" />
-                            <f:ListItem Text="所有行" Value="100000" />
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                                <f:BoundField HeaderText="序号" DataField="Code" HeaderTextAlign="Center" Width="150px">
+                                </f:BoundField>
+                                <f:BoundField DataField="DriverDataName" HeaderText="资料名称" HeaderTextAlign="Center" Width="330px">
+                                </f:BoundField>
+                                <f:BoundField DataField="Remark" HeaderText="备注" HeaderTextAlign="Center" ExpandUnusedSpace="true">
+                                </f:BoundField>
+                                <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
+                                    TextAlign="Center" ToolTip="附件查看" Icon="Find" />
+                            </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="10" Value="10" />
+                                    <f:ListItem Text="15" Value="15" />
+                                    <f:ListItem Text="20" Value="20" />
+                                    <f:ListItem Text="25" Value="25" />
+                                    <f:ListItem Text="所有行" Value="100000" />
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="开车资料收集" Hidden="true" EnableIFrame="true" EnableMaximize="true"
@@ -82,9 +99,29 @@
                 </f:MenuButton>
             </Items>
         </f:Menu>
+        <f:Menu ID="Menu2" runat="server">
+            <Items>
+                <f:MenuButton ID="btnMenuAdd" EnablePostBack="true" runat="server" Text="新增" Icon="Add" OnClick="btnMenuAdd_Click" Hidden="true">
+                </f:MenuButton>
+                <f:MenuButton ID="btnMenuModify2" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify2_Click" Hidden="true">
+                </f:MenuButton>
+                <f:MenuButton ID="btnMenuDel2" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除类别及其下所有内容吗？"
+                    OnClick="btnMenuDel2_Click" Hidden="true">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
     </form>
     <script type="text/javascript">
         var menuID = '<%= Menu1.ClientID %>';
+        var menuID2 = '<%= Menu2.ClientID %>';
+        var currentNodeId;
+         var currentNodeId;
+        // 返回false，来阻止浏览器右键菜单
+        function onTreeNodeContextMenu(event, nodeId) {
+            currentNodeId = nodeId;
+            F(menuID2).show();
+            return false;
+        }
 
         // 返回false，来阻止浏览器右键菜单
         function onRowContextMenu(event, rowId) {
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverData.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverData.aspx.cs
index 48fc334e..d41cd614 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverData.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverData.aspx.cs
@@ -15,19 +15,146 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
             if (!IsPostBack)
             {
                 GetButtonPower();
-                BindGrid();
-                btnNew.OnClientClick = Window1.GetShowReference("DriverDataEdit.aspx") + "return false;";
+                var dataTypes = from x in Funs.DB.DriverPrepare_DriverDataType where x.ProjectId == this.CurrUser.LoginProjectId select x;
+                if (dataTypes.Count() == 0)
+                {
+                    //预置类别
+                    Model.DriverPrepare_DriverDataType dataType1 = new Model.DriverPrepare_DriverDataType
+                    {
+                        DriverDataTypeId = SQLHelper.GetNewID(),
+                        ProjectId = this.CurrUser.LoginProjectId,
+                        DriverDataTypeCode = "001",
+                        DriverDataTypeName = "项目实施计划",
+                        ParentId = "0",
+                    };
+                    Model.DriverPrepare_DriverDataType dataType2 = new Model.DriverPrepare_DriverDataType
+                    {
+                        DriverDataTypeId = SQLHelper.GetNewID(),
+                        ProjectId = this.CurrUser.LoginProjectId,
+                        DriverDataTypeCode = "002",
+                        DriverDataTypeName = "项目WBS",
+                        ParentId = "0",
+                    };
+                    Model.DriverPrepare_DriverDataType dataType3 = new Model.DriverPrepare_DriverDataType
+                    {
+                        DriverDataTypeId = SQLHelper.GetNewID(),
+                        ProjectId = this.CurrUser.LoginProjectId,
+                        DriverDataTypeCode = "003",
+                        DriverDataTypeName = "项目总图",
+                        ParentId = "0",
+                    };
+                    Model.DriverPrepare_DriverDataType dataType4 = new Model.DriverPrepare_DriverDataType
+                    {
+                        DriverDataTypeId = SQLHelper.GetNewID(),
+                        ProjectId = this.CurrUser.LoginProjectId,
+                        DriverDataTypeCode = "004",
+                        DriverDataTypeName = "项目设计资料",
+                        ParentId = "0",
+                    };
+                    BLL.DriverPrepareDriverDataTypeService.AddDriverDataType(dataType1);
+                    BLL.DriverPrepareDriverDataTypeService.AddDriverDataType(dataType2);
+                    BLL.DriverPrepareDriverDataTypeService.AddDriverDataType(dataType3);
+                    BLL.DriverPrepareDriverDataTypeService.AddDriverDataType(dataType4);
+                }
+                InitTree();//加载类别树
             }
         }
 
+        #region 绑定资料库类别
+        /// <summary>
+        /// 绑定资料库树节点
+        /// </summary>
+        private void InitTree()
+        {
+            this.tvDataTypeInit.Nodes.Clear();
+            TreeNode node = new TreeNode();
+            node.Text = "开车资料收集";
+            node.NodeID = "0";
+            node.Expanded = true;
+            this.tvDataTypeInit.Nodes.Add(node);
+            var types = from x in Funs.DB.DriverPrepare_DriverDataType where x.ProjectId == this.CurrUser.LoginProjectId select x;
+            var dataType = from x in types
+                           where x.ParentId == "0"
+                           orderby x.DriverDataTypeCode
+                           select x;
+            foreach (var q in dataType)
+            {
+                TreeNode newNode = new TreeNode();
+                newNode.ToolTip = q.DriverDataTypeName;
+                newNode.Text = q.DriverDataTypeName;
+                newNode.NodeID = q.DriverDataTypeId;
+                newNode.EnableExpandEvent = true;
+                newNode.EnableClickEvent = true;
+                node.Nodes.Add(newNode);
+                var childTypes = from x in types where x.ParentId == q.DriverDataTypeId select x;
+                if (childTypes.Count() > 0)
+                {
+                    TreeNode emptyNode = new TreeNode();
+                    emptyNode.Text = "";
+                    emptyNode.NodeID = "";
+                    newNode.Nodes.Add(emptyNode);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 展开树
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void trWBS_NodeExpand(object sender, TreeNodeEventArgs e)
+        {
+            e.Node.Nodes.Clear();
+            var types = from x in Funs.DB.DriverPrepare_DriverDataType
+                             where x.ProjectId == this.CurrUser.LoginProjectId && x.ParentId == e.Node.NodeID
+                             select x;
+            if (types.Count() > 0)
+            {
+                foreach (var type in types)
+                {
+                    TreeNode newNode = new TreeNode();
+                    newNode.ToolTip = type.DriverDataTypeName;
+                    newNode.Text = type.DriverDataTypeName;
+                    newNode.NodeID = type.DriverDataTypeId;
+                    newNode.EnableExpandEvent = true;
+                    newNode.EnableClickEvent = true;
+                    e.Node.Nodes.Add(newNode);
+                    var childTypes = from x in Funs.DB.DriverPrepare_DriverDataType where x.ParentId == type.DriverDataTypeId select x;
+                    if (childTypes.Count() > 0)
+                    {
+                        TreeNode temp = new TreeNode();
+                        temp.Text = "";
+                        temp.NodeID = "";
+                        newNode.Nodes.Add(temp);
+                    }
+                }
+            }
+        }
+        #endregion
+        #endregion
+
+        #region 树点击事件
+        /// <summary>
+        /// 资料库类别树点击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void tvDataTypeInit_NodeCommand(object sender, TreeCommandEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 数据绑定
         /// <summary>
         /// 数据绑定
         /// </summary>
         public void BindGrid()
         {
-            string strSql = @"select * from DriverPrepare_DriverData where ProjectId=@projectId ";
+            string strSql = @"select * from DriverPrepare_DriverData where ProjectId=@projectId and DriverDataTypeId=@DriverDataTypeId";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@DriverDataTypeId", this.tvDataTypeInit.SelectedNodeID));
             if (!string.IsNullOrEmpty(this.SDriverDataName.Text))
             {
                 strSql += " and DriverDataName like @DriverDataName";
@@ -43,6 +170,87 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
         }
         #endregion
 
+        #region 维护类别
+        /// <summary>
+        /// 增加类别
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuAdd_Click(object sender, EventArgs e)
+        {
+            string id = this.tvDataTypeInit.SelectedNodeID;
+            if (!string.IsNullOrEmpty(id))
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DriverDataTypeEdit.aspx?DriverDataTypeId={0}&type={1}", id, "add", "编辑 - ")));
+            }
+        }
+
+        /// <summary>
+        /// 修改类别
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuModify2_Click(object sender, EventArgs e)
+        {
+            string id = this.tvDataTypeInit.SelectedNodeID;
+            if (!string.IsNullOrEmpty(id) && id != "0")
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DriverDataTypeEdit.aspx?DriverDataTypeId={0}&type={1}", id, "edit", "编辑 - ")));
+            }
+            else
+            {
+                Alert.ShowInTop("请选择类别", MessageBoxIcon.Warning);
+                return;
+            }
+        }
+
+        /// <summary>
+        /// 删除类别
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuDel2_Click(object sender, EventArgs e)
+        {
+            string id = this.tvDataTypeInit.SelectedNodeID;
+            if (!string.IsNullOrEmpty(id) && id != "0")
+            {
+                Model.DriverPrepare_DriverDataType DriverDataType = BLL.DriverPrepareDriverDataTypeService.GetDriverDataTypeById(id);
+                if (DriverDataType != null)
+                {
+                    List<Model.DriverPrepare_DriverDataType> dataTypes = BLL.DriverPrepareDriverDataTypeService.GetDriverDataTypesBySuperDriverDataTypeId(id);
+                    if (dataTypes.Count > 0)     //含有子类别
+                    {
+                        DeleteDetail(dataTypes);
+                    }
+                    BLL.DriverPrepareDriverDataTypeService.DeleteDriverDataType(id);
+                }
+            }
+            else
+            {
+                Alert.ShowInTop("请选择类别", MessageBoxIcon.Warning);
+                return;
+            }
+            InitTree();
+        }
+
+        /// <summary>
+        /// 循环删除子级类别
+        /// </summary>
+        /// <param name="dataTypes"></param>
+        private void DeleteDetail(List<Model.DriverPrepare_DriverDataType> dataTypes)
+        {
+            foreach (var d in dataTypes)
+            {
+                List<Model.DriverPrepare_DriverDataType> childDataTypes = BLL.DriverPrepareDriverDataTypeService.GetDriverDataTypesBySuperDriverDataTypeId(d.DriverDataTypeId);
+                if (childDataTypes.Count > 0)
+                {
+                    DeleteDetail(childDataTypes);
+                }
+                BLL.DriverPrepareDriverDataTypeService.DeleteDriverDataType(d.DriverDataTypeId);
+            }
+        }
+        #endregion
+
         #region 分页
         /// <summary>
         /// 分页索引事件
@@ -98,10 +306,38 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
         /// <param name="e"></param>
         protected void Window1_Close(object sender, WindowCloseEventArgs e)
         {
+            InitTree();
             BindGrid();
         }
         #endregion
 
+        #region 增加按钮
+        /// <summary>
+        /// 增加
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnNew_Click(object sender, EventArgs e)
+        {
+            if (this.tvDataTypeInit.SelectedNode != null)
+            {
+                //if (this.trWBS.SelectedNode.Nodes.Count == 0)   //末级节点
+                if (this.tvDataTypeInit.SelectedNodeID!="0")
+                {
+                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DriverDataEdit.aspx?DriverDataTypeId={0}", this.tvDataTypeInit.SelectedNode.NodeID, "新增 - ")));
+                }
+                else
+                {
+                    Alert.ShowInTop("请选择类别！", MessageBoxIcon.Warning);
+                }
+            }
+            else
+            {
+                Alert.ShowInTop("请选择树节点！", MessageBoxIcon.Warning);
+            }
+        }
+        #endregion
+
         #region 编辑
         protected void btnMenuModify_Click(object sender, EventArgs e)
         {
@@ -185,15 +421,18 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
                 if (buttonList.Contains(BLL.Const.BtnAdd))
                 {
                     this.btnNew.Hidden = false;
+                    this.btnMenuAdd.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnModify))
                 {
                     this.btnMenuModify.Hidden = false;
+                    this.btnMenuModify2.Hidden = false;
                     this.Grid1.EnableRowDoubleClickEvent = true;
                 }
                 if (buttonList.Contains(BLL.Const.BtnDelete))
                 {
                     this.btnMenuDel.Hidden = false;
+                    this.btnMenuDel2.Hidden = false;
                 }
             }
         }
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverData.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverData.aspx.designer.cs
index e8b97714..7aa017d5 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverData.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverData.aspx.designer.cs
@@ -39,6 +39,33 @@ namespace FineUIPro.Web.TestRun.DriverPrepare {
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
         
+        /// <summary>
+        /// Panel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel2;
+        
+        /// <summary>
+        /// tvDataTypeInit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree tvDataTypeInit;
+        
+        /// <summary>
+        /// Panel4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel4;
+        
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -155,5 +182,41 @@ namespace FineUIPro.Web.TestRun.DriverPrepare {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuDel;
+        
+        /// <summary>
+        /// Menu2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu2;
+        
+        /// <summary>
+        /// btnMenuAdd 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuAdd;
+        
+        /// <summary>
+        /// btnMenuModify2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuModify2;
+        
+        /// <summary>
+        /// btnMenuDel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDel2;
     }
 }
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverDataEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverDataEdit.aspx.cs
index aab5b013..eae1e69e 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverDataEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverDataEdit.aspx.cs
@@ -56,11 +56,13 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
         protected void btnSave_Click(object sender, EventArgs e)
         {
             string id = Request.Params["driverDataId"];
+            string driverDataTypeId = Request.Params["DriverDataTypeId"];
             Model.DriverPrepare_DriverData newDriverData = new Model.DriverPrepare_DriverData();
             newDriverData.Code = this.txtCode.Text.Trim();
             newDriverData.DriverDataName = this.txtDriverDataName.Text.Trim();
             newDriverData.Remark = this.txtRemark.Text.Trim();
             newDriverData.ProjectId = this.CurrUser.LoginProjectId;
+            newDriverData.DriverDataTypeId = driverDataTypeId;
             if (!string.IsNullOrEmpty(id))
             {
                 newDriverData.DriverDataId = id;
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverDataTypeEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverDataTypeEdit.aspx
new file mode 100644
index 00000000..98afa5ae
--- /dev/null
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverDataTypeEdit.aspx
@@ -0,0 +1,55 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DriverDataTypeEdit.aspx.cs" Inherits="FineUIPro.Web.TestRun.DriverPrepare.DriverDataTypeEdit" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>编辑类别</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                        </f:ToolbarFill>
+                        <f:Button ID="btnSave" OnClick="btnSave_Click" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel2" Title="资料库维护" ShowBorder="true"
+                            BodyPadding="10px" EnableCollapse="true" ShowHeader="false" AutoScroll="true"
+                            runat="server">
+                            <f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+                                BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+                                <Rows>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:TextBox ID="txtDataTypeCode" runat="server" Label="类别编号" LabelAlign="Right" LabelWidth="130px" Required="true" ShowRedStar="true">
+                                            </f:TextBox>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:TextBox ID="txtDataTypeName" runat="server" Label="类别名称" LabelAlign="Right" LabelWidth="130px" Required="true" ShowRedStar="true">
+                                            </f:TextBox>
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+                        </f:ContentPanel>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+        </f:Form>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverDataTypeEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverDataTypeEdit.aspx.cs
new file mode 100644
index 00000000..ce52f24d
--- /dev/null
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverDataTypeEdit.aspx.cs
@@ -0,0 +1,65 @@
+using BLL;
+using System;
+using System.Linq;
+
+namespace FineUIPro.Web.TestRun.DriverPrepare
+{
+    public partial class DriverDataTypeEdit : PageBase
+    {
+        #region 加载
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                string type = Request.Params["type"];
+                string dataTypeId = Request.Params["DriverDataTypeId"];
+                if (type == "edit")
+                {
+                    var data = BLL.DriverPrepareDriverDataTypeService.GetDriverDataTypeById(dataTypeId);
+                    if (data != null)
+                    {
+                        this.txtDataTypeName.Text = data.DriverDataTypeName;
+                        this.txtDataTypeCode.Text = data.DriverDataTypeCode;
+                    }
+                }
+                else if (type == "add")
+                {
+                }
+            }
+        }
+        #endregion
+
+        #region 保存
+        /// <summary>
+        /// 保存按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            string type = Request.Params["type"];
+            string dataTypeId = Request.Params["DriverDataTypeId"];
+            if (type == "edit")
+            {
+                Model.DriverPrepare_DriverDataType dataType = BLL.DriverPrepareDriverDataTypeService.GetDriverDataTypeById(dataTypeId);
+                //dataType.DataTypeId = dataTypeId;
+                dataType.DriverDataTypeCode = this.txtDataTypeCode.Text.Trim();
+                dataType.DriverDataTypeName = this.txtDataTypeName.Text.Trim();
+                BLL.DriverPrepareDriverDataTypeService.UpdateDriverDataType(dataType);
+            }
+            else if (type == "add")
+            {
+                Model.DriverPrepare_DriverDataType newDataType = new Model.DriverPrepare_DriverDataType();
+                newDataType.DriverDataTypeName = this.txtDataTypeName.Text.Trim();
+                newDataType.DriverDataTypeCode = this.txtDataTypeCode.Text.Trim();
+                newDataType.ParentId = dataTypeId;
+                newDataType.ProjectId = this.CurrUser.LoginProjectId;
+                newDataType.DriverDataTypeId = SQLHelper.GetNewID(typeof(Model.DriverPrepare_DriverDataType));
+                BLL.DriverPrepareDriverDataTypeService.AddDriverDataType(newDataType);
+            }
+            ShowNotify("保存成功！", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverDataTypeEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverDataTypeEdit.aspx.designer.cs
new file mode 100644
index 00000000..19ca2997
--- /dev/null
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DriverDataTypeEdit.aspx.designer.cs
@@ -0,0 +1,105 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.TestRun.DriverPrepare {
+    
+    
+    public partial class DriverDataTypeEdit {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+        
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+        
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+        
+        /// <summary>
+        /// ContentPanel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel2;
+        
+        /// <summary>
+        /// Form2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form2;
+        
+        /// <summary>
+        /// txtDataTypeCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtDataTypeCode;
+        
+        /// <summary>
+        /// txtDataTypeName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtDataTypeName;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/Duty.aspx b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/Duty.aspx
index 57861253..f2a964f1 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/Duty.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/Duty.aspx
@@ -6,104 +6,103 @@
 <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;
+        }
+
+        .f-grid-colheader-text {
+            white-space: normal;
+            word-break: break-all;
+        }
+    </style>
 </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" Title="开车责任分工表" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="DutyId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="DutyId" AllowSorting="true" SortField="DutyCode"
-                    SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" EnableTextSelection="True" OnRowCommand="Grid1_RowCommand" OnRowDoubleClick="Grid1_RowDoubleClick">
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="开车责任分工表"
+                    EnableCollapse="true" KeepCurrentSelection="true" runat="server" BoxFlex="1"
+                    DataKeyNames="DutyItemId" AllowColumnLocking="true" EnableColumnLines="true" AllowCellEditing="true" ClicksToEdit="1"
+                    DataIDField="DutyItemId" EnableTextSelection="True" AllowSorting="true" SortField="Code"
+                    SortDirection="ASC" AllowPaging="false" IsDatabasePaging="true"
+                    PageSize="100">
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:TextBox runat="server" ID="SDutyName" Label="文件名称" LabelAlign="Right"></f:TextBox>
-                                <f:TextBox runat="server" ID="SDutyCode" Label="编号" LabelAlign="Right"></f:TextBox>
-                                <f:Button ID="btnSearch" Icon="SystemSearch"
-                                    EnablePostBack="true" runat="server" OnClick="btnSearch_Click">
-                                </f:Button>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnNew" Icon="Add" ToolTip="新增" EnablePostBack="false" runat="server" Hidden="true">
                                 </f:Button>
+                                <f:Button ID="btnModify" Icon="Pencil" ToolTip="修改" OnClick="btnMenuModify_Click" runat="server" Hidden="true">
+                                </f:Button>
+                                <f:Button ID="btnDel" Icon="Delete" ToolTip="删除" OnClick="btnMenuDel_Click" runat="server" ConfirmText="确定删除当前数据？" Hidden="true">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
                     <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" Width="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="DutyName" DataField="DutyName"
-                            FieldType="String" HeaderText="文件名称" HeaderTextAlign="Center" Width="320px">
+                        <f:RenderField HeaderText="阶段" ColumnID="Stage"
+                            DataField="Stage" FieldType="String" HeaderTextAlign="Center"
+                            TextAlign="Left" Width="50px">
                         </f:RenderField>
-                          <f:RenderField ColumnID="DutyCode" DataField="DutyCode"
-                            FieldType="String" HeaderText="编号" HeaderTextAlign="Center" Width="320px">
+                        <f:RenderField HeaderText="序号" ColumnID="Code" DataField="Code"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center"
+                            Width="50px">
                         </f:RenderField>
-                          <f:RenderField ColumnID="UserName" DataField="UserName"
-                            FieldType="String" HeaderText="编制人" HeaderTextAlign="Center" Width="120px">
+                        <f:RenderField HeaderText="活动内容" ColumnID="ActivityContent"
+                            DataField="ActivityContent" FieldType="String" HeaderTextAlign="Left"
+                            TextAlign="Left" Width="250px">
                         </f:RenderField>
-                          <f:RenderField ColumnID="CompileDate" DataField="CompileDate"
-                            FieldType="Date" Renderer="Date" HeaderText="编制时间" HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                          <f:RenderField ColumnID="Remark" DataField="Remark"
-                            FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
-                        </f:RenderField>
-                        <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
-                            TextAlign="Center" ToolTip="附件查看" Icon="Find" />
+                        <f:GroupField ColumnID="c2" HeaderText="责任分工" TextAlign="Center">
+                            <Columns>
+                                <f:CheckBoxField Width="60px" RenderAsStaticField="true" ColumnID="Item1" DataField="Item1" HeaderText="技术文件编制" TextAlign="Center" />
+                                <f:CheckBoxField Width="60px" RenderAsStaticField="true" ColumnID="Item2" DataField="Item2" HeaderText="操作规程编制" TextAlign="Center" />
+                                <f:CheckBoxField Width="60px" RenderAsStaticField="true" ColumnID="Item3" DataField="Item3" HeaderText="实施方案编制" TextAlign="Center" />
+                                <f:CheckBoxField Width="60px" RenderAsStaticField="true" ColumnID="Item4" DataField="Item4" HeaderText="技术指导" TextAlign="Center" />
+                                <f:CheckBoxField Width="60px" RenderAsStaticField="true" ColumnID="Item5" DataField="Item5" HeaderText="临时措施" TextAlign="Center" />
+                                <f:CheckBoxField Width="60px" RenderAsStaticField="true" ColumnID="Item6" DataField="Item6" HeaderText="组织指挥" TextAlign="Center" />
+                                <f:CheckBoxField Width="60px" RenderAsStaticField="true" ColumnID="Item7" DataField="Item7" HeaderText="操作执行" TextAlign="Center" />
+                                <f:CheckBoxField Width="60px" RenderAsStaticField="true" ColumnID="Item8" DataField="Item8" HeaderText="记录报告" TextAlign="Center" />
+                                <f:CheckBoxField Width="60px" RenderAsStaticField="true" ColumnID="Item9" DataField="Item9" HeaderText="公用工程保障" TextAlign="Center" />
+                                <f:CheckBoxField Width="60px" RenderAsStaticField="true" ColumnID="Item10" DataField="Item10" HeaderText="原料供应" TextAlign="Center" />
+                                <f:CheckBoxField Width="60px" RenderAsStaticField="true" ColumnID="Item11" DataField="Item11" HeaderText="分析化验" TextAlign="Center" />
+                                <f:CheckBoxField Width="60px" RenderAsStaticField="true" ColumnID="Item12" DataField="Item12" HeaderText="保运" TextAlign="Center" />
+                                <f:CheckBoxField Width="60px" RenderAsStaticField="true" ColumnID="Item13" DataField="Item13" HeaderText="备品备件供应" TextAlign="Center" />
+                                <f:CheckBoxField Width="60px" RenderAsStaticField="true" ColumnID="Item14" DataField="Item14" HeaderText="产出物料处置" TextAlign="Center" />
+                                <f:RenderField HeaderText="备注" ColumnID="Remark" DataField="Remark" SortField="Remark" ExpandUnusedSpace="true"
+                                    HeaderTextAlign="Center" TextAlign="Center" Width="100px" FieldType="String">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
                     </Columns>
                     <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                        <f:Listener Event="dataload" Handler="onGridDataLoad" />
                     </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="10" Value="10" />
-                            <f:ListItem Text="15" Value="15" />
-                            <f:ListItem Text="20" Value="20" />
-                            <f:ListItem Text="25" Value="25" />
-                            <f:ListItem Text="所有行" Value="100000" />
-                        </f:DropDownList>
-                    </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" OnClose="Window1_Close"
-            Width="800px" Height="500px">
+            Width="1400px" Height="600px">
         </f:Window>
         <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:Menu ID="Menu1" runat="server">
-            <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">
-                </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;
-        }
         function reloadGrid() {
             __doPostBack(null, 'reloadGrid');
         }
+
+        function onGridDataLoad(event) {
+            this.mergeColumns(['Stage'], {
+                depends: true
+            });
+        }
     </script>
 </body>
 </html>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/Duty.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/Duty.aspx.cs
index fa65ee0f..66a83189 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/Duty.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/Duty.aspx.cs
@@ -25,64 +25,26 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
         //加载列表
         public void BindGrid()
         {
-            string strSql = @"select * , u.UserName from DriverPrepare_Duty chec"
-                            + @" left join sys_User u on u.userId = chec.CompileMan where chec.ProjectId=@projectId";
-            List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
-            if (!string.IsNullOrEmpty(this.SDutyName.Text))
+            var duty = (from x in Funs.DB.DriverPrepare_Duty where x.ProjectId == this.CurrUser.LoginProjectId select x).FirstOrDefault();
+            if (duty != null)
             {
-                strSql += " AND DutyName like @DutyName";
-                listStr.Add(new SqlParameter("@DutyName", "%" + this.SDutyName.Text.Trim() + "%"));
+                string strSql = @"select * from DriverPrepare_DutyItem chec"
+                             + @" where chec.DutyId=@DutyId";
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                listStr.Add(new SqlParameter("@DutyId", duty.DutyId));
+                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(this.SDutyCode.Text))
+            else
             {
-                strSql += " AND DutyCode like @DutyCode";
-                listStr.Add(new SqlParameter("@DutyCode", "%" + this.SDutyCode.Text.Trim() + "%"));
+                Grid1.DataSource = null;
+                Grid1.DataBind();
             }
-
-            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
-
-        #region 分页
-        /// <summary>
-        /// 分页索引事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
-        {
-            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
 
@@ -127,31 +89,29 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
         /// </summary>
         private void EditData()
         {
-            if (Grid1.SelectedRowIndexArray.Length == 0)
+            var duty = (from x in Funs.DB.DriverPrepare_Duty where x.ProjectId == this.CurrUser.LoginProjectId select x).FirstOrDefault();
+            if (duty == null)
             {
-                Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
+                Alert.ShowInTop("项目记录尚未生成，请先新增记录！", MessageBoxIcon.Warning);
                 return;
             }
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DutyEdit.aspx?id={0}", Grid1.SelectedRowID, "编辑 - ")));
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DutyEdit.aspx?id={0}", duty.DutyId, "编辑 - ")));
         }
         #endregion
 
         #region 删除
         protected void btnMenuDel_Click(object sender, EventArgs e)
         {
-            if (Grid1.SelectedRowIndexArray.Length > 0)
+            var duty = (from x in Funs.DB.DriverPrepare_Duty where x.ProjectId == this.CurrUser.LoginProjectId select x).FirstOrDefault();
+            if (duty == null)
             {
-                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
-                {
-                    var DriverDataIdInfo = BLL.DriverPrepareDutyService.GetDriverPlanById(Grid1.SelectedRowID);
-                    if (DriverDataIdInfo != null)
-                    {
-                        BLL.DriverPrepareDutyService.DeleteDriverPlan(Grid1.SelectedRowID);
-                    }
-                }
-                BindGrid();
-                ShowNotify("删除数据成功!", MessageBoxIcon.Success);
+                Alert.ShowInTop("项目无记录，无需删除！", MessageBoxIcon.Warning);
+                return;
             }
+            BLL.DriverPrepareDutyItemService.DeleteDutyItemByDutyId(duty.DutyId);
+            BLL.DriverPrepareDutyService.DeleteDriverPrepareDuty(duty.DutyId);
+            BindGrid();
+            ShowNotify("删除数据成功!", MessageBoxIcon.Success);
         }
         #endregion
 
@@ -186,12 +146,12 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
                 }
                 if (buttonList.Contains(BLL.Const.BtnModify))
                 {
-                    this.btnMenuModify.Hidden = false;
+                    this.btnModify.Hidden = false;
                     this.Grid1.EnableRowDoubleClickEvent = true;
                 }
                 if (buttonList.Contains(BLL.Const.BtnDelete))
                 {
-                    this.btnMenuDel.Hidden = false;
+                    this.btnDel.Hidden = false;
                 }
             }
         }
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/Duty.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/Duty.aspx.designer.cs
index 7b65923c..6df812db 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/Duty.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/Duty.aspx.designer.cs
@@ -57,33 +57,6 @@ namespace FineUIPro.Web.TestRun.DriverPrepare {
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
         
-        /// <summary>
-        /// SDutyName 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox SDutyName;
-        
-        /// <summary>
-        /// SDutyCode 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox SDutyCode;
-        
-        /// <summary>
-        /// btnSearch 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnSearch;
-        
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -94,40 +67,22 @@ namespace FineUIPro.Web.TestRun.DriverPrepare {
         protected global::FineUIPro.Button btnNew;
         
         /// <summary>
-        /// lblPageIndex 控件。
+        /// btnModify 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+        protected global::FineUIPro.Button btnModify;
         
         /// <summary>
-        /// ToolbarSeparator1 控件。
+        /// btnDel 控件。
         /// </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;
+        protected global::FineUIPro.Button btnDel;
         
         /// <summary>
         /// Window1 控件。
@@ -146,32 +101,5 @@ namespace FineUIPro.Web.TestRun.DriverPrepare {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
-        /// <summary>
-        /// Menu1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Menu Menu1;
-        
-        /// <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/TestRun/DriverPrepare/DutyEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DutyEdit.aspx
index b548f0cd..9430d3b3 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DutyEdit.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DutyEdit.aspx
@@ -4,88 +4,99 @@
 
 <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>
+    <style type="text/css">
+        .f-grid-row .f-grid-cell-inner {
+            white-space: normal;
+            word-break: break-all;
+        }
+
+        .f-grid-colheader-text {
+            white-space: normal;
+            word-break: break-all;
+        }
+    </style>
 </head>
 <body>
-    <form id="form1" runat="server">  
-        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
-        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
-            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
-            <Toolbars>
-                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager2" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="开车责任分工表"
+                    TitleToolTip="开车责任分工表" AutoScroll="true">
                     <Items>
-                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                        </f:ToolbarFill>
-                        <f:Button ID="btnSave" OnClick="btnSave_Click" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1">
-                        </f:Button>
-                        <f:HiddenField ID="hdAttachUrl" runat="server">
-                        </f:HiddenField>
-                        <f:HiddenField ID="hdId" runat="server"></f:HiddenField>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="开车责任分工表"
+                            EnableCollapse="true" KeepCurrentSelection="true" runat="server" BoxFlex="1"
+                            DataKeyNames="DutyItemId" AllowColumnLocking="true" EnableColumnLines="true" AllowCellEditing="true" ClicksToEdit="1"
+                            DataIDField="DutyItemId" EnableTextSelection="True" AllowSorting="true" SortField="Code"
+                            SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="false" IsDatabasePaging="true"
+                            PageSize="100">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
+                                    <Items>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnSave" OnClick="btnSave_Click" Icon="SystemSave" runat="server" ToolTip="保存">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RenderField HeaderText="阶段" ColumnID="Stage"
+                                    DataField="Stage" FieldType="String" HeaderTextAlign="Center"
+                                    TextAlign="Left" Width="50px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="序号" ColumnID="Code" DataField="Code"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center"
+                                    Width="50px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="活动内容" ColumnID="ActivityContent"
+                                    DataField="ActivityContent" FieldType="String" HeaderTextAlign="Left"
+                                    TextAlign="Left" Width="250px">
+                                </f:RenderField>
+                                <f:GroupField ColumnID="c2" HeaderText="责任分工" TextAlign="Center">
+                                    <Columns>
+                                        <f:CheckBoxField Width="60px" RenderAsStaticField="false" ColumnID="Item1" DataField="Item1" HeaderText="技术文件编制" TextAlign="Center" />
+                                        <f:CheckBoxField Width="60px" RenderAsStaticField="false" ColumnID="Item2" DataField="Item2" HeaderText="操作规程编制" TextAlign="Center" />
+                                        <f:CheckBoxField Width="60px" RenderAsStaticField="false" ColumnID="Item3" DataField="Item3" HeaderText="实施方案编制" TextAlign="Center" />
+                                        <f:CheckBoxField Width="60px" RenderAsStaticField="false" ColumnID="Item4" DataField="Item4" HeaderText="技术指导" TextAlign="Center" />
+                                        <f:CheckBoxField Width="60px" RenderAsStaticField="false" ColumnID="Item5" DataField="Item5" HeaderText="临时措施" TextAlign="Center" />
+                                        <f:CheckBoxField Width="60px" RenderAsStaticField="false" ColumnID="Item6" DataField="Item6" HeaderText="组织指挥" TextAlign="Center" />
+                                        <f:CheckBoxField Width="60px" RenderAsStaticField="false" ColumnID="Item7" DataField="Item7" HeaderText="操作执行" TextAlign="Center" />
+                                        <f:CheckBoxField Width="60px" RenderAsStaticField="false" ColumnID="Item8" DataField="Item8" HeaderText="记录报告" TextAlign="Center" />
+                                        <f:CheckBoxField Width="60px" RenderAsStaticField="false" ColumnID="Item9" DataField="Item9" HeaderText="公用工程保障" TextAlign="Center" />
+                                        <f:CheckBoxField Width="60px" RenderAsStaticField="false" ColumnID="Item10" DataField="Item10" HeaderText="原料供应" TextAlign="Center" />
+                                        <f:CheckBoxField Width="60px" RenderAsStaticField="false" ColumnID="Item11" DataField="Item11" HeaderText="分析化验" TextAlign="Center" />
+                                        <f:CheckBoxField Width="60px" RenderAsStaticField="false" ColumnID="Item12" DataField="Item12" HeaderText="保运" TextAlign="Center" />
+                                        <f:CheckBoxField Width="60px" RenderAsStaticField="false" ColumnID="Item13" DataField="Item13" HeaderText="备品备件供应" TextAlign="Center" />
+                                        <f:CheckBoxField Width="60px" RenderAsStaticField="false" ColumnID="Item14" DataField="Item14" HeaderText="产出物料处置" TextAlign="Center" />
+                                        <f:RenderField HeaderText="备注" ColumnID="Remark" DataField="Remark" SortField="Remark" ExpandUnusedSpace="true"
+                                            HeaderTextAlign="Center" TextAlign="Center" Width="100px" FieldType="String">
+                                            <Editor>
+                                                <f:TextBox runat="server" ID="txtRemark">
+                                                </f:TextBox>
+                                            </Editor>
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                            </Columns>
+                            <Listeners>
+                            <f:Listener Event="dataload" Handler="onGridDataLoad" />
+                        </Listeners>
+                        </f:Grid>
                     </Items>
-                </f:Toolbar>
-            </Toolbars>
-            <Rows>
-                <f:FormRow>
-                    <Items>
-                        <f:ContentPanel ID="ContentPanel2" ShowBorder="true"
-                            BodyPadding="10px" EnableCollapse="true" ShowHeader="false" AutoScroll="true"
-                            runat="server">
-                            <f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
-                                BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
-                                <Rows>
-                                    <f:FormRow>
-                                        <Items>
-                                            <f:TextBox ID="txtCode" runat="server" Label="编号" LabelAlign="Right" LabelWidth="130px" MaxLength="50" Required="true" ShowRedStar="true">
-                                            </f:TextBox>
-                                        </Items>
-                                    </f:FormRow>
-                                    <f:FormRow>
-                                        <Items>
-                                            <f:TextBox ID="txtName" runat="server" Label="文件名称" LabelAlign="Right" LabelWidth="130px" Required="true" ShowRedStar="true" MaxLength="50">
-                                            </f:TextBox>
-                                        </Items>
-                                    </f:FormRow> 
-                                    <f:FormRow>
-                                        <Items>
-                                            <f:DropDownList ID="drpCompileMan" runat="server" Label="编制人" LabelAlign="Right" LabelWidth="130px"></f:DropDownList>
-                                        </Items>
-                                    </f:FormRow>
-                                    <f:FormRow>
-                                        <Items>
-                                            <f:DatePicker ID="txtCompileDate" runat="server" Label="编制时间" LabelAlign="Right" LabelWidth="130px"></f:DatePicker>
-                                        </Items>
-                                    </f:FormRow>
-                                    <f:FormRow>
-                                        <Items>
-                                            <f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="Right" LabelWidth="130px" MaxLength="500">
-                                            </f:TextArea>
-                                        </Items>
-                                    </f:FormRow>
-                                    <f:FormRow runat="server">
-                                        <Items>
-                                            <f:Panel ID="Panel3" Width="300px" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
-                                                <Items>
-                                                    <f:Label ID="lblAttach" runat="server" Label="上传附件"
-                                                        LabelWidth="130px">
-                                                    </f:Label>
-                                                    <f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
-                                                    </f:Button>
-                                                </Items>
-                                            </f:Panel>
-                                        </Items>
-                                    </f:FormRow>
-                                </Rows>
-                            </f:Form>
-                        </f:ContentPanel>
-                    </Items>
-                </f:FormRow>
-            </Rows>
-        </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:Panel>
+            </Items>
+        </f:Panel>
     </form>
+    <script type="text/javascript">
+        function onGridDataLoad(event) {
+            this.mergeColumns(['Stage'], {
+                depends: true
+            });
+        }
+    </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DutyEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DutyEdit.aspx.cs
index 3ac477a8..a8818dbf 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DutyEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DutyEdit.aspx.cs
@@ -1,5 +1,10 @@
 using BLL;
+using Newtonsoft.Json.Linq;
 using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
 
 namespace FineUIPro.Web.TestRun.DriverPrepare
 {
@@ -15,41 +20,56 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
         {
             if (!IsPostBack)
             {
-                BLL.UserService.InitUserDropDownList(this.drpCompileMan, this.CurrUser.LoginProjectId, true);
                 string id = Request.Params["id"];
                 if (!string.IsNullOrEmpty(id))
                 {
-                    Model.DriverPrepare_Duty data = BLL.DriverPrepareDutyService.GetDriverPlanById(id);
-                    if (data != null)
+                    BindGrid();
+                }
+                else
+                {
+                    var list = DriverPrepareDutyItemService.GetLists("Empty");
+                    if (list.Count == 0)
                     {
-                        this.hdId.Text = id;
-                        this.txtCode.Text = data.DutyCode;
-                        this.txtName.Text = data.DutyName;
-                        if (!string.IsNullOrEmpty(data.CompileMan))
-                        {
-                            this.drpCompileMan.SelectedValue = data.CompileMan;
-                        }
-                        this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : "";
-                        this.txtRemark.Text = data.Remark;
+                        DriverPrepareDutyItemService.CreateDutyItems();
                     }
+                    BindGrid();
                 }
             }
         }
         #endregion
 
-        #region 附件上传
+        #region 数据绑定
+        //加载列表
+        public void BindGrid()
+        {
+            string strSql = @"select * from DriverPrepare_DutyItem chec"
+                            + @" where chec.DutyId=@DutyId";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            string id = "Empty";
+            if (!string.IsNullOrEmpty(Request.Params["id"]))
+            {
+                id = Request.Params["id"];
+            }
+            listStr.Add(new SqlParameter("@DutyId", id));
+            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
+
+        #region 排序
         /// <summary>
-        /// 附件上传
+        /// 排序
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        protected void btnAttach_Click(object sender, EventArgs e)
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
         {
-            if (string.IsNullOrEmpty(this.hdId.Text))   //新增记录
-            {
-                this.hdId.Text = SQLHelper.GetNewID(typeof(Model.DriverPrepare_Duty));
-            }
-            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverPrepare/Duty&menuId={1}", this.hdId.Text, BLL.Const.DutyMenuId)));
+            this.BindGrid();
         }
         #endregion
 
@@ -63,14 +83,8 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
         {
             string id = Request.Params["id"];
             Model.DriverPrepare_Duty newData = new Model.DriverPrepare_Duty();
-            newData.DutyCode = this.txtCode.Text.Trim();
-            newData.DutyName = this.txtName.Text.Trim();
-            if (this.drpCompileMan.SelectedValue != BLL.Const._Null)
-            {
-                newData.CompileMan = this.drpCompileMan.SelectedValue;
-            }
-            newData.CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text.Trim());
-            newData.Remark = this.txtRemark.Text.Trim();
+            newData.CompileMan = this.CurrUser.UserId;
+            newData.CompileDate = DateTime.Now;
             newData.ProjectId = this.CurrUser.LoginProjectId;
             if (!string.IsNullOrEmpty(id))
             {
@@ -79,20 +93,85 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
             }
             else
             {
-                if (!string.IsNullOrEmpty(this.hdId.Text))
-                {
-                    newData.DutyId = this.hdId.Text.Trim();
-                }
-                else
-                {
-                    newData.DutyId = SQLHelper.GetNewID(typeof(Model.DriverPrepare_Duty));
-                    this.hdId.Text = newData.DutyId;
-                }
+                newData.DutyId = SQLHelper.GetNewID(typeof(Model.DriverPrepare_Duty));
                 BLL.DriverPrepareDutyService.AddDriverPrepareDriverPlan(newData);
             }
+            CheckBoxField Item1 = (CheckBoxField)Grid1.FindColumn("Item1");
+            CheckBoxField Item2 = (CheckBoxField)Grid1.FindColumn("Item2");
+            CheckBoxField Item3 = (CheckBoxField)Grid1.FindColumn("Item3");
+            CheckBoxField Item4 = (CheckBoxField)Grid1.FindColumn("Item4");
+            CheckBoxField Item5 = (CheckBoxField)Grid1.FindColumn("Item5");
+            CheckBoxField Item6 = (CheckBoxField)Grid1.FindColumn("Item6");
+            CheckBoxField Item7 = (CheckBoxField)Grid1.FindColumn("Item7");
+            CheckBoxField Item8 = (CheckBoxField)Grid1.FindColumn("Item8");
+            CheckBoxField Item9 = (CheckBoxField)Grid1.FindColumn("Item9");
+            CheckBoxField Item10 = (CheckBoxField)Grid1.FindColumn("Item10");
+            CheckBoxField Item11 = (CheckBoxField)Grid1.FindColumn("Item11");
+            CheckBoxField Item12 = (CheckBoxField)Grid1.FindColumn("Item12");
+            CheckBoxField Item13 = (CheckBoxField)Grid1.FindColumn("Item13");
+            CheckBoxField Item14 = (CheckBoxField)Grid1.FindColumn("Item14");
+            if (string.IsNullOrEmpty(id))
+            {
+                id = "Empty";
+            }
+            var list = DriverPrepareDutyItemService.GetLists(id);
+            foreach (JObject mergedRow in Grid1.GetMergedData())
+            {
+                int i = mergedRow.Value<int>("index");
+                var item = list.FirstOrDefault(x => x.DutyItemId == Grid1.Rows[i].RowID);
+                JObject values = mergedRow.Value<JObject>("values");
+                if (item != null)
+                {
+                    item.DutyId = newData.DutyId;
+                    item.Item1 = Item1.GetCheckedState(i);
+                    item.Item2 = Item2.GetCheckedState(i);
+                    item.Item3 = Item3.GetCheckedState(i);
+                    item.Item4 = Item4.GetCheckedState(i);
+                    item.Item5 = Item5.GetCheckedState(i);
+                    item.Item6 = Item6.GetCheckedState(i);
+                    item.Item7 = Item7.GetCheckedState(i);
+                    item.Item8 = Item8.GetCheckedState(i);
+                    item.Item9 = Item9.GetCheckedState(i);
+                    item.Item10 = Item10.GetCheckedState(i);
+                    item.Item11 = Item11.GetCheckedState(i);
+                    item.Item12 = Item12.GetCheckedState(i);
+                    item.Item13 = Item13.GetCheckedState(i);
+                    item.Item14 = Item14.GetCheckedState(i);
+                    item.Remark = values.Value<string>("Remark");
+                    BLL.DriverPrepareDutyItemService.UpdateDutyItem(item);
+                }
+            }
             ShowNotify("保存成功！", MessageBoxIcon.Success);
             PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
         }
         #endregion
+
+        protected void Button1_Click(object sender, EventArgs e)
+        {
+            CheckBoxField field1 = (CheckBoxField)Grid1.FindColumn("CheckBoxField1");
+
+            int selectedCount = Grid1.SelectedRowIndexArray.Length;
+            //if (selectedCount > 0)
+            //{
+
+
+            //    for (int i = 0; i < selectedCount; i++)
+            //    {
+            //        int rowIndex = Grid1.SelectedRowIndexArray[i];
+            //        sb.Append("<tr>");
+
+            //        sb.AppendFormat("<td>{0}</td>", rowIndex + 1);
+            //        sb.AppendFormat("<td>{0}</td>", field1.GetCheckedState(rowIndex));
+
+            //        sb.Append("</tr>");
+            //    }
+
+            //    sb.Append("</table>");
+            //}
+            //else
+            //{
+            //    sb.Append("<strong>没有选中任何一行！</strong>");
+            //}
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DutyEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DutyEdit.aspx.designer.cs
index 3c03cb3e..3ddeac29 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DutyEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DutyEdit.aspx.designer.cs
@@ -22,31 +22,49 @@ namespace FineUIPro.Web.TestRun.DriverPrepare {
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
         
         /// <summary>
-        /// PageManager1 控件。
+        /// PageManager2 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.PageManager PageManager1;
+        protected global::FineUIPro.PageManager PageManager2;
         
         /// <summary>
-        /// SimpleForm1 控件。
+        /// Panel1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Form SimpleForm1;
+        protected global::FineUIPro.Panel Panel1;
         
         /// <summary>
-        /// Toolbar1 控件。
+        /// panelCenterRegion 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Toolbar Toolbar1;
+        protected global::FineUIPro.Panel panelCenterRegion;
+        
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
         
         /// <summary>
         /// ToolbarFill1 控件。
@@ -66,78 +84,6 @@ namespace FineUIPro.Web.TestRun.DriverPrepare {
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
         
-        /// <summary>
-        /// hdAttachUrl 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.HiddenField hdAttachUrl;
-        
-        /// <summary>
-        /// hdId 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.HiddenField hdId;
-        
-        /// <summary>
-        /// ContentPanel2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.ContentPanel ContentPanel2;
-        
-        /// <summary>
-        /// Form2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Form Form2;
-        
-        /// <summary>
-        /// txtCode 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtCode;
-        
-        /// <summary>
-        /// txtName 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtName;
-        
-        /// <summary>
-        /// drpCompileMan 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList drpCompileMan;
-        
-        /// <summary>
-        /// txtCompileDate 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DatePicker txtCompileDate;
-        
         /// <summary>
         /// txtRemark 控件。
         /// </summary>
@@ -145,42 +91,6 @@ namespace FineUIPro.Web.TestRun.DriverPrepare {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextArea txtRemark;
-        
-        /// <summary>
-        /// Panel3 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Panel Panel3;
-        
-        /// <summary>
-        /// lblAttach 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label lblAttach;
-        
-        /// <summary>
-        /// btnAttach 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnAttach;
-        
-        /// <summary>
-        /// WindowAtt 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Window WindowAtt;
+        protected global::FineUIPro.TextBox txtRemark;
     }
 }
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx
index d420be8b..062eeb3e 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx
@@ -9,75 +9,47 @@
 </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" Title="开车方案编制计划 " EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="SchemePlanId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="SchemePlanId" AllowSorting="true" SortField="SchemePlanCode"
-                    SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" EnableTextSelection="True" OnRowCommand="Grid1_RowCommand" OnRowDoubleClick="Grid1_RowDoubleClick">
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="方案列表" EnableCollapse="false" runat="server"
+                    BoxFlex="1" DataKeyNames="SchemePlanItemId" AllowCellEditing="true" EnableColumnLines="true" SortField="SortIndex" SortDirection="ASC"
+                    ClicksToEdit="1" DataIDField="SchemePlanItemId" AllowSorting="true" EnableRowDoubleClickEvent="false " OnRowDoubleClick="Grid1_RowDoubleClick"
+                    EnableTextSelection="True">
                     <Toolbars>
-                        <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
+                        <f:Toolbar ID="Toolbar4" ToolbarAlign="Right" runat="server">
                             <Items>
-                                <f:TextBox runat="server" ID="SSchemePlanName" Label="计划名称" LabelAlign="Right"></f:TextBox>
-                                <f:TextBox runat="server" ID="SSchemePlanCode" Label="编号" LabelAlign="Right"></f:TextBox>
-                                <f:Button ID="btnSearch" Icon="SystemSearch"
-                                    EnablePostBack="true" runat="server" OnClick="btnSearch_Click">
+                                <f:TextBox ID="hdItemsString" runat="server" Hidden="true"></f:TextBox>
+                                <f:Button ID="btnSelect" runat="server" Icon="ShapeSquareSelect" ToolTip="模板库选择方案" OnClick="btnSelect_Click">
                                 </f:Button>
-                                <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnNew" Icon="Add" ToolTip="新增" EnablePostBack="true" runat="server" Hidden="true">
+                                <f:Button ID="btnNew" OnClick="btnNew_Click" Icon="Add" EnablePostBack="true" runat="server" ToolTip="新增方案">
                                 </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"
-                            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="SchemePlanName" DataField="SchemePlanName"
-                            FieldType="String" HeaderText="计划名称" HeaderTextAlign="Center" Width="320px">
+                        <f:RowNumberField Width="60px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" />
+                        <f:RenderField HeaderText="方案名称" ColumnID="SolutionName" DataField="SolutionName" Width="740px" ExpandUnusedSpace="true"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
                         </f:RenderField>
-                          <f:RenderField ColumnID="SchemePlanCode" DataField="SchemePlanCode"
-                            FieldType="String" HeaderText="编号" HeaderTextAlign="Center" Width="320px">
-                        </f:RenderField>
-                          <f:RenderField ColumnID="UserName" DataField="UserName"
-                            FieldType="String" HeaderText="编制人" HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                          <f:RenderField ColumnID="CompileDate" DataField="CompileDate"
-                            FieldType="Date" Renderer="Date" HeaderText="编制时间" HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                          <f:RenderField ColumnID="Remark" DataField="Remark"
-                            FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
-                        </f:RenderField>
-                        <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
-                            TextAlign="Center" ToolTip="附件查看" Icon="Find" />
                     </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="10" Value="10" />
-                            <f:ListItem Text="15" Value="15" />
-                            <f:ListItem Text="20" Value="20" />
-                            <f:ListItem Text="25" Value="25" />
-                            <f:ListItem Text="所有行" Value="100000" />
-                        </f:DropDownList>
-                    </PageItems>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
                 </f:Grid>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="开车方案编制计划" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
-            Width="800px" Height="500px">
+            Width="1000px" Height="650px">
+        </f:Window>
+        <f:Window ID="Window2" Title="开车方案编制计划" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
+            Width="600px" Height="350px">
         </f:Window>
         <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
@@ -85,7 +57,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" Hidden="true">
                 </f:MenuButton>
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
                     OnClick="btnMenuDel_Click">
@@ -95,12 +67,13 @@
     </form>
     <script type="text/javascript">
         var menuID = '<%= Menu1.ClientID %>';
-
-        // 返回false，来阻止浏览器右键菜单
+      
+          // 返回false，来阻止浏览器右键菜单
         function onRowContextMenu(event, rowId) {
             F(menuID).show();  //showAt(event.pageX, event.pageY);
             return false;
         }
+
         function reloadGrid() {
             __doPostBack(null, 'reloadGrid');
         }
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.cs
index c010c329..cb89735d 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.cs
@@ -1,8 +1,10 @@
 using BLL;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
+using System.IO;
 using System.Linq;
 
 namespace FineUIPro.Web.TestRun.DriverPrepare
@@ -16,7 +18,6 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
             {
                 GetButtonPower();
                 BindGrid();
-                btnNew.OnClientClick = Window1.GetShowReference("SchemePlanEdit.aspx") + "return false;";
             }
         }
         #endregion
@@ -25,21 +26,10 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
         //加载列表
         public void BindGrid()
         {
-            string strSql =   @"select * , u.UserName from DriverPrepare_SchemePlan chec"
-                            + @" left join sys_User u on u.userId = chec.CompileMan where chec.ProjectId=@projectId";
+            string strSql = @"select * from DriverPrepare_SchemePlanItem chec"
+                            + @" left join DriverPrepare_SchemePlan u on u.SchemePlanId = chec.SchemePlanId where u.ProjectId=@projectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
-            if (!string.IsNullOrEmpty(this.SSchemePlanName.Text))
-            {
-                strSql += " AND SchemePlanName like @SchemePlanName";
-                listStr.Add(new SqlParameter("@SchemePlanName", "%" + this.SSchemePlanName.Text.Trim() + "%"));
-            }
-
-            if (!string.IsNullOrEmpty(this.SSchemePlanCode.Text))
-            {
-                strSql += " AND SchemePlanCode like @SchemePlanCode";
-                listStr.Add(new SqlParameter("@SchemePlanCode", "%" + this.SSchemePlanCode.Text.Trim() + "%"));
-            }
 
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -51,65 +41,6 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
         }
         #endregion
 
-        #region 分页
-        /// <summary>
-        /// 分页索引事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
-        {
-            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="sender"></param>
-        /// <param name="e"></param>
-        protected void btnSearch_Click(object sender, EventArgs e)
-        {
-            BindGrid();
-        }
-        #endregion
-
-        #region 关闭弹出窗口
-        /// <summary>
-        /// 关闭弹出窗口
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void Window1_Close(object sender, WindowCloseEventArgs e)
-        {
-            BindGrid();
-        }
-        #endregion
-
         #region 编辑
         protected void btnMenuModify_Click(object sender, EventArgs e)
         {
@@ -136,7 +67,7 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
                 Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
                 return;
             }
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SchemePlanEdit.aspx?id={0}", Grid1.SelectedRowID, "编辑 - ")));
+            PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("SchemePlanItemAdd.aspx?SchemePlanItemId={0}", Grid1.SelectedRowID, "编辑 - ")));
         }
         #endregion
 
@@ -147,11 +78,7 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
             {
                 foreach (int rowIndex in Grid1.SelectedRowIndexArray)
                 {
-                    var DriverDataIdInfo = BLL.DriverPrepareSchemePlanService.GetDriverPlanById(Grid1.SelectedRowID);
-                    if (DriverDataIdInfo != null)
-                    {
-                        BLL.DriverPrepareSchemePlanService.DeleteDriverPlan(Grid1.SelectedRowID);
-                    }
+                    BLL.DriverPrepareSchemePlanItemService.DeleteSchemePlanItemById(Grid1.SelectedRowID);
                 }
                 BindGrid();
                 ShowNotify("删除数据成功!", MessageBoxIcon.Success);
@@ -159,22 +86,6 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
         }
         #endregion
 
-        #region Grid行点击事件
-        /// <summary>
-        /// Grid行点击事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
-        {
-            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/DriverPrepare/SchemePlan&menuId={1}", id, BLL.Const.SchemePlanMenuId)));
-            }
-        }
-        #endregion
-
         #region 权限设置
         /// <summary>
         /// 权限设置
@@ -200,5 +111,160 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
             }
         }
         #endregion
+
+        #region 搜索
+        /// <summary>
+        /// 搜索
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnNew_Click(object sender, EventArgs e)
+        {
+            string window = String.Format("SchemePlanItemAdd.aspx", "新增 - ");
+            PageContext.RegisterStartupScript(Window2.GetSaveStateReference(hdItemsString.ClientID) + Window2.GetShowReference(window));
+        }
+        #endregion
+
+        #region 关闭弹出窗口
+        /// <summary>
+        /// 关闭弹出窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        /// <summary>
+        /// 选择事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSelect_Click(object sender, EventArgs e)
+        {
+            //JArray mergedData = Grid1.GetMergedData();
+            //string names = string.Empty;
+            //foreach (JObject mergedRow in mergedData)
+            //{
+            //    string status = mergedRow.Value<string>("status");
+            //    JObject values = mergedRow.Value<JObject>("values");
+            //    names += values.Value<string>("SolutionName").ToString() + ",";
+            //}
+            //if (!string.IsNullOrEmpty(names))
+            //{
+            //    hdItemsString.Text = names.Substring(0, names.Length - 1);
+            //}
+            Model.DriverPrepare_SchemePlan plan = BLL.DriverPrepareSchemePlanService.GetDriverPlanByProjectId(this.CurrUser.LoginProjectId);
+            string schemePlanId = string.Empty;
+            if (plan != null)
+            {
+                schemePlanId = plan.SchemePlanId;
+            }
+            string window = String.Format("SchemePlanItemSelect.aspx?SchemePlanId={0}", schemePlanId, "选择 - ");
+            PageContext.RegisterStartupScript(Window1.GetShowReference(window));
+        }
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            string rootPath = Server.MapPath("~/");
+            string initTemplatePath = string.Empty;
+            string uploadfilepath = string.Empty;
+            string newUrl = string.Empty;
+            string filePath = string.Empty;
+            initTemplatePath = Const.SchemePlanTemplateUrl;
+            uploadfilepath = rootPath + initTemplatePath;
+            Model.DriverPrepare_SchemePlan plan = BLL.DriverPrepareSchemePlanService.GetDriverPlanByProjectId(this.CurrUser.LoginProjectId);
+            if (plan != null)
+            {
+                string projectName = BLL.ProjectService.GetProjectNameByProjectId(plan.ProjectId);
+                newUrl = uploadfilepath.Replace(".xlsx", "(" + projectName + ")" + ".xlsx");
+                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);
+                }
+                // 创建单元格样式
+                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;
+                var font = workbook.CreateFont();
+                font.FontHeightInPoints = 11;
+                cellStyle.SetFont(font);
+                NPOI.SS.UserModel.ICellStyle cellStyle0 = workbook.CreateCellStyle();
+                cellStyle0.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle0.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle0.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle0.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle0.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
+                cellStyle0.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center;
+                var font0 = workbook.CreateFont();
+                font0.FontHeightInPoints = 12;
+                font0.IsBold = true;
+                cellStyle0.SetFont(font0);
+                // 第二步：创建新数据行
+                NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0);
+                NPOI.SS.UserModel.IRow row = sheet.GetRow(0);
+                NPOI.SS.UserModel.ICell cell;
+                cell = row.GetCell(0);
+                cell.CellStyle = cellStyle0;
+                cell.SetCellValue(projectName + "试车方案");
+                var items = BLL.DriverPrepareSchemePlanItemService.GetSchemePlanItemByschemePlanId(plan.SchemePlanId);
+                int i = 2;
+                foreach (var item in items)
+                {
+                    // 第二步：创建新数据行
+                    row = sheet.CreateRow(i);
+                    // 添加数据
+                    cell = row.CreateCell(0);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue((i-1).ToString());
+                    cell = row.CreateCell(1);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(item.SolutionName);
+                    cell = row.CreateCell(2);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(string.Empty);
+                    cell = row.CreateCell(3);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(string.Empty);
+                    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
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.designer.cs
index eff6415d..39adf730 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.designer.cs
@@ -49,40 +49,31 @@ namespace FineUIPro.Web.TestRun.DriverPrepare {
         protected global::FineUIPro.Grid Grid1;
         
         /// <summary>
-        /// ToolSearch 控件。
+        /// Toolbar4 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Toolbar ToolSearch;
+        protected global::FineUIPro.Toolbar Toolbar4;
         
         /// <summary>
-        /// SSchemePlanName 控件。
+        /// hdItemsString 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox SSchemePlanName;
+        protected global::FineUIPro.TextBox hdItemsString;
         
         /// <summary>
-        /// SSchemePlanCode 控件。
+        /// btnSelect 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox SSchemePlanCode;
-        
-        /// <summary>
-        /// btnSearch 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnSearch;
+        protected global::FineUIPro.Button btnSelect;
         
         /// <summary>
         /// btnNew 控件。
@@ -94,40 +85,13 @@ namespace FineUIPro.Web.TestRun.DriverPrepare {
         protected global::FineUIPro.Button btnNew;
         
         /// <summary>
-        /// lblPageIndex 控件。
+        /// btnOut 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
-        /// <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;
+        protected global::FineUIPro.Button btnOut;
         
         /// <summary>
         /// Window1 控件。
@@ -138,6 +102,15 @@ namespace FineUIPro.Web.TestRun.DriverPrepare {
         /// </remarks>
         protected global::FineUIPro.Window Window1;
         
+        /// <summary>
+        /// Window2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window2;
+        
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanEdit.aspx
index e11b5c8e..ce8c504d 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanEdit.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanEdit.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>
@@ -15,6 +15,7 @@
             <Toolbars>
                 <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
                     <Items>
+                        <f:TextBox ID="hdItemsString" runat="server" Hidden="true"></f:TextBox>
                         <f:ToolbarFill ID="ToolbarFill1" runat="server">
                         </f:ToolbarFill>
                         <f:Button ID="btnSave" OnClick="btnSave_Click" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1">
@@ -38,28 +39,47 @@
                                         <Items>
                                             <f:TextBox ID="txtCode" runat="server" Label="编号" LabelAlign="Right" LabelWidth="130px" MaxLength="50" Required="true" ShowRedStar="true">
                                             </f:TextBox>
-                                        </Items>
-                                    </f:FormRow>
-                                    <f:FormRow>
-                                        <Items>
                                             <f:TextBox ID="txtName" runat="server" Label="计划名称" LabelAlign="Right" LabelWidth="130px" Required="true" ShowRedStar="true" MaxLength="50">
                                             </f:TextBox>
                                         </Items>
-                                    </f:FormRow> 
+                                    </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:DropDownList ID="drpCompileMan" runat="server" Label="编制人" LabelAlign="Right" LabelWidth="130px"></f:DropDownList>
+                                            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" Title="方案列表" EnableCollapse="false" runat="server"
+                                                BoxFlex="1" DataKeyNames="SchemePlanItemId" AllowCellEditing="true" EnableColumnLines="true" SortField="SortIndex" SortDirection="ASC"
+                                                ClicksToEdit="1" DataIDField="SchemePlanItemId" OnRowCommand="Grid1_RowCommand" AllowSorting="true" 
+                                                EnableTextSelection="True">
+                                                <Toolbars>
+                                                    <f:Toolbar ID="Toolbar4" ToolbarAlign="Right" runat="server">
+                                                        <Items>
+                                                            <f:Button ID="btnSelect" runat="server" Icon="ShapeSquareSelect" ToolTip="模板库选择方案" OnClick="btnSelect_Click">
+                                                            </f:Button>
+                                                            <f:Button ID="btnNew" OnClick="btnNew_Click" Icon="Add" EnablePostBack="true" runat="server" ToolTip="新增方案">
+                                                            </f:Button>
+                                                        </Items>
+                                                    </f:Toolbar>
+                                                </Toolbars>
+                                                <Columns>
+                                                    <f:RowNumberField Width="60px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" />
+                                                    <f:RenderField HeaderText="方案名称" ColumnID="SolutionName" DataField="SolutionName" Width="740px" ExpandUnusedSpace="true"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
+                                                    </f:RenderField>
+                                                    <f:LinkButtonField ColumnID="Del" HeaderText="删除" HeaderTextAlign="Center" TextAlign="Center" Width="60px" CommandName="delete"
+                                                        Icon="Delete" />
+                                                </Columns>
+                                            </f:Grid>
                                         </Items>
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
+                                            <f:DropDownList ID="drpCompileMan" runat="server" Label="编制人" LabelAlign="Right" LabelWidth="130px"></f:DropDownList>
                                             <f:DatePicker ID="txtCompileDate" runat="server" Label="编制时间" LabelAlign="Right" LabelWidth="130px"></f:DatePicker>
                                         </Items>
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="Right" LabelWidth="130px" MaxLength="500">
-                                            </f:TextArea>
+                                            <f:TextBox ID="txtRemark" runat="server" Label="备注" LabelAlign="Right" LabelWidth="130px" MaxLength="500">
+                                            </f:TextBox>
                                         </Items>
                                     </f:FormRow>
                                     <f:FormRow runat="server">
@@ -82,10 +102,14 @@
                 </f:FormRow>
             </Rows>
         </f:Form>
+        <f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true"
+            EnableMaximize="true" Target="Top" EnableResize="false" runat="server"
+            IsModal="true" Width="700px" Height="500px" OnClose="Window1_Close">
+        </f:Window>
         <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>
     </form>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanEdit.aspx.cs
index 5c2f8252..420752e5 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanEdit.aspx.cs
@@ -1,5 +1,8 @@
 using BLL;
+using Newtonsoft.Json.Linq;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace FineUIPro.Web.TestRun.DriverPrepare
 {
@@ -33,6 +36,13 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
                         this.txtRemark.Text = data.Remark;
                     }
                 }
+                else
+                {
+                    this.txtCode.Text = "001";
+                    this.txtName.Text = "开车方案编制计划";
+                    this.drpCompileMan.SelectedValue = this.CurrUser.UserId;
+                    this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+                }
             }
         }
         #endregion
@@ -94,5 +104,117 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
             PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
         }
         #endregion
+
+        protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
+        {
+            string itemId = Grid1.DataKeys[e.RowIndex][0].ToString();
+            List<Model.DriverPrepare_SchemePlanItem> details = jerqueSaveList();
+            if (e.CommandName == "delete")
+            {
+                foreach (Model.DriverPrepare_SchemePlanItem detail in details)
+                {
+                    if (detail.SchemePlanItemId == itemId)
+                    {
+                        details.Remove(detail);
+                        break;
+                    }
+                }
+                Grid1.DataSource = details;
+                Grid1.DataBind();
+            }
+        }
+
+        #region  保存Grid集合
+        /// <summary>
+        /// 检查并保存集合
+        /// </summary>
+        private List<Model.DriverPrepare_SchemePlanItem> jerqueSaveList()
+        {
+            List<Model.DriverPrepare_SchemePlanItem> details = new List<Model.DriverPrepare_SchemePlanItem>();
+            var list = BLL.DriverPrepareSchemePlanItemService.GetModelList(); 
+            foreach (JObject mergedRow in Grid1.GetMergedData())
+            {
+                JObject values = mergedRow.Value<JObject>("values");
+                int i = mergedRow.Value<int>("index");
+                Model.DriverPrepare_SchemePlanItem detail = new Model.DriverPrepare_SchemePlanItem();
+                detail.SchemePlanItemId = this.Grid1.Rows[i].RowID;
+                detail.SolutionName = values.Value<string>("SolutionName");
+                var item = list.FirstOrDefault(x => x.SolutionName == detail.SolutionName);
+                if (item != null)
+                {
+                    detail.SortIndex = item.SortIndex;
+                }
+                details.Add(detail);
+            }
+            return details;
+        }
+        #endregion
+
+        #region 搜索
+        /// <summary>
+        /// 搜索
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnNew_Click(object sender, EventArgs e)
+        {
+            string window = String.Format("SchemePlanItemAdd.aspx", "新增 - ");
+            PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdItemsString.ClientID) + Window1.GetShowReference(window));
+        }
+        #endregion
+
+        #region 关闭弹出窗口
+        /// <summary>
+        /// 关闭弹出窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            if (!string.IsNullOrEmpty(hdItemsString.Text))
+            {
+                string[] ids = hdItemsString.Text.Split(',');
+                int i = 1;
+                var details = jerqueSaveList();
+                foreach (var id in ids)
+                {
+                    var oldDetail = details.FirstOrDefault(x => x.SolutionName == id);
+                    if (oldDetail == null)   //添加集合没有的新纪录
+                    {
+                        Model.DriverPrepare_SchemePlanItem detail = new Model.DriverPrepare_SchemePlanItem();
+                        detail.SchemePlanItemId = SQLHelper.GetNewID();
+                        detail.SolutionName = id;
+                        details.Add(detail);
+                    }
+                    i++;
+                }
+                this.Grid1.DataSource = details;
+                this.Grid1.DataBind();
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// 选择事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSelect_Click(object sender, EventArgs e)
+        {
+            JArray mergedData = Grid1.GetMergedData();
+            string names = string.Empty;
+            foreach (JObject mergedRow in mergedData)
+            {
+                string status = mergedRow.Value<string>("status");
+                JObject values = mergedRow.Value<JObject>("values");
+                names += values.Value<string>("SolutionName").ToString() + ",";
+            }
+            if (!string.IsNullOrEmpty(names))
+            {
+                hdItemsString.Text = names.Substring(0, names.Length - 1);
+            }
+            string window = String.Format("SchemePlanItemSelect.aspx?names={0}", hdItemsString.Text, "选择 - ");
+            PageContext.RegisterStartupScript(Window1.GetSaveStateReference(this.hdItemsString.ClientID) + Window1.GetShowReference(window));
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanEdit.aspx.designer.cs
index 4537f7f7..f7a5cb9e 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanEdit.aspx.designer.cs
@@ -48,6 +48,15 @@ namespace FineUIPro.Web.TestRun.DriverPrepare {
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
         
+        /// <summary>
+        /// hdItemsString 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox hdItemsString;
+        
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -120,6 +129,42 @@ namespace FineUIPro.Web.TestRun.DriverPrepare {
         /// </remarks>
         protected global::FineUIPro.TextBox txtName;
         
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Toolbar4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar4;
+        
+        /// <summary>
+        /// btnSelect 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSelect;
+        
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+        
         /// <summary>
         /// drpCompileMan 控件。
         /// </summary>
@@ -145,7 +190,7 @@ namespace FineUIPro.Web.TestRun.DriverPrepare {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextArea txtRemark;
+        protected global::FineUIPro.TextBox txtRemark;
         
         /// <summary>
         /// Panel3 控件。
@@ -174,6 +219,15 @@ namespace FineUIPro.Web.TestRun.DriverPrepare {
         /// </remarks>
         protected global::FineUIPro.Button btnAttach;
         
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+        
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx
new file mode 100644
index 00000000..d362434e
--- /dev/null
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx
@@ -0,0 +1,35 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SchemePlanItemAdd.aspx.cs" Inherits="FineUIPro.Web.TestRun.DriverPrepare.SchemePlanItemAdd" %>
+
+<!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:TextBox ID="txtSolutionName" runat="server" Label="方案名称" LabelWidth="100px" Required="true" ShowRedStar="true"></f:TextBox>
+                    </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">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:Form>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx.cs
new file mode 100644
index 00000000..3b71c7b6
--- /dev/null
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx.cs
@@ -0,0 +1,77 @@
+using 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.TestRun.DriverPrepare
+{
+    public partial class SchemePlanItemAdd : PageBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                string SchemePlanItemId = Request.Params["SchemePlanItemId"];
+                if (!string.IsNullOrEmpty(SchemePlanItemId))
+                {
+                    Model.DriverPrepare_SchemePlanItem item = DriverPrepareSchemePlanItemService.GetSchemePlanItemById(SchemePlanItemId);
+                    if (item != null)
+                    {
+                        this.txtSolutionName.Text = item.SolutionName;
+                    }
+                }
+            }
+        }
+
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            string SchemePlanItemId = Request.Params["SchemePlanItemId"];
+            if (!BLL.DriverPrepareSchemePlanItemService.IsExistSolutionName(this.CurrUser.LoginProjectId, this.txtSolutionName.Text.Trim(), SchemePlanItemId))
+            {
+                Model.DriverPrepare_SchemePlanItem newItem = new Model.DriverPrepare_SchemePlanItem();
+                newItem.SolutionName = this.txtSolutionName.Text.Trim();
+                Model.DriverPrepare_SchemePlan plan = BLL.DriverPrepareSchemePlanService.GetDriverPlanByProjectId(this.CurrUser.LoginProjectId);
+                int sortIndex = 21;
+                if (plan != null)
+                {
+                    var items = BLL.DriverPrepareSchemePlanItemService.GetSchemePlanItemByschemePlanId(plan.SchemePlanId);
+                    sortIndex += items.Count;
+                    newItem.SchemePlanId = plan.SchemePlanId;
+                }
+                else
+                {
+                    Model.DriverPrepare_SchemePlan newData = new Model.DriverPrepare_SchemePlan();
+                    newData.SchemePlanCode = "001";
+                    newData.SchemePlanName = "开车方案编制计划";
+                    newData.CompileMan = this.CurrUser.UserId;
+                    newData.CompileDate = DateTime.Now;
+                    newData.ProjectId = this.CurrUser.LoginProjectId;
+                    newData.SchemePlanId = SQLHelper.GetNewID(typeof(Model.DriverPrepare_SchemePlan));
+                    BLL.DriverPrepareSchemePlanService.AddDriverPrepareDriverPlan(newData);
+                    newItem.SchemePlanId = newData.SchemePlanId;
+                }
+                newItem.SortIndex = sortIndex;
+                if (string.IsNullOrEmpty(SchemePlanItemId))
+                {
+                    newItem.SchemePlanItemId = SQLHelper.GetNewID();
+                    BLL.DriverPrepareSchemePlanItemService.AddSchemePlanItem(newItem);
+                    BLL.LogService.AddSys_Log(this.CurrUser, newItem.SolutionName, newItem.SolutionName, BLL.Const.ControlItemInitSetMenuId, "增加开车方案！");
+                }
+                if (Request.Params["type"] == "modify")
+                {
+                    newItem.SchemePlanItemId = SchemePlanItemId;
+                    BLL.DriverPrepareSchemePlanItemService.UpdateSchemePlanItem(newItem);
+                    BLL.LogService.AddSys_Log(this.CurrUser, newItem.SolutionName, newItem.SolutionName, BLL.Const.ControlItemInitSetMenuId, "修改开车方案！");
+                }
+                PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+            }
+            else
+            {
+                ShowNotify("此方案已存在！", MessageBoxIcon.Warning);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx.designer.cs
new file mode 100644
index 00000000..793f876e
--- /dev/null
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx.designer.cs
@@ -0,0 +1,69 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.TestRun.DriverPrepare {
+    
+    
+    public partial class SchemePlanItemAdd {
+        
+        /// <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>
+        /// txtSolutionName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSolutionName;
+        
+        /// <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/TestRun/DriverPrepare/SchemePlanItemSelect.aspx b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemSelect.aspx
new file mode 100644
index 00000000..1895bcb4
--- /dev/null
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemSelect.aspx
@@ -0,0 +1,59 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SchemePlanItemSelect.aspx.cs" Inherits="FineUIPro.Web.TestRun.DriverPrepare.SchemePlanItemSelect" %>
+
+<!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" ShowBorder="false" ShowHeader="false" Layout="Region">
+        <Items>            
+            <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="焊口信息"
+                TitleToolTip="焊口信息" AutoScroll="true">
+                <Items>
+                    <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口信息"
+                        EnableCollapse="true" KeepCurrentSelection="true" runat="server" BoxFlex="1"
+                        DataKeyNames="SchemePlanItemId,SolutionName" AllowColumnLocking="true" EnableColumnLines="true"
+                        DataIDField="SchemePlanItemId" EnableTextSelection="True" AllowSorting="true" SortField="SortIndex"
+                        SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="false" IsDatabasePaging="true"
+                        PageSize="10000" EnableCheckBoxSelect="true">
+                        <Toolbars>
+                            <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
+                                <Items>              
+                                    <f:RadioButtonList ID="rblType" runat="server" AutoPostBack="true" Width="320px"
+                                            OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
+                                            <f:RadioItem Value="合成氨尿素项目" Text="合成氨尿素项目" Selected="true" />
+                                            <f:RadioItem Value="磷酸项目" Text="磷酸项目" />
+                                            <f:RadioItem Value="LNG项目" Text="LNG项目" />
+                                        </f:RadioButtonList>
+                                    <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                    </f:ToolbarFill>
+                                    <f:Button ID="btnAccept" Icon="Accept" runat="server" Text="确定" ToolTip="确定"
+                                        OnClick="btnAccept_Click">
+                                    </f:Button>
+                                </Items>
+                            </f:Toolbar>
+                        </Toolbars>
+                        <Columns>
+                            <f:RenderField HeaderText="序号" ColumnID="SortIndex"
+                                DataField="SortIndex" FieldType="String" HeaderTextAlign="Center"
+                                TextAlign="Center" Width="60px">
+                            </f:RenderField>
+                           <f:RenderField HeaderText="方案名称" ColumnID="SolutionName" DataField="SolutionName" ExpandUnusedSpace="true"
+                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
+                                Width="100px">
+                            </f:RenderField>
+                        </Columns>
+                    </f:Grid>
+                </Items>
+            </f:Panel>
+        </Items>
+    </f:Panel>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemSelect.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemSelect.aspx.cs
new file mode 100644
index 00000000..1f4c3d03
--- /dev/null
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemSelect.aspx.cs
@@ -0,0 +1,126 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.TestRun.DriverPrepare
+{
+    public partial class SchemePlanItemSelect : PageBase
+    {
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.BindGrid();
+            }
+        }
+        #endregion
+
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+
+        #region 数据绑定
+        /// <summary>
+        /// 数据绑定
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"SELECT * 
+                               FROM dbo.DriverPrepare_SchemePlanItem 
+                               WHERE SchemePlanId=@SchemePlanId";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@SchemePlanId", this.rblType.SelectedValue));
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+
+            Model.DriverPrepare_SchemePlan plan = BLL.DriverPrepareSchemePlanService.GetDriverPlanByProjectId(this.CurrUser.LoginProjectId);
+            if (plan != null)
+            {
+                var items = BLL.DriverPrepareSchemePlanItemService.GetSchemePlanItemByschemePlanId(plan.SchemePlanId);
+                List<string> nameLists = items.Select(x => x.SolutionName).ToList();
+                List<string> ids = new List<string>();
+                foreach (GridRow row in Grid1.Rows)
+                {
+                    if (nameLists.Contains(row.DataKeys[1].ToString()))
+                    {
+                        ids.Add(row.RowID);
+                    }
+                }
+                this.Grid1.SelectedRowIDArray = ids.ToArray();
+            }
+        }
+        #endregion
+
+        #region 排序
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 确定按钮
+        /// <summary>
+        /// 确定按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAccept_Click(object sender, EventArgs e)
+        {
+            string schemePlanId = Request.Params["SchemePlanId"];
+            Model.DriverPrepare_SchemePlan newData = new Model.DriverPrepare_SchemePlan();
+            newData.SchemePlanCode = "001";
+            newData.SchemePlanName = "开车方案编制计划";
+            newData.CompileMan = this.CurrUser.UserId;
+            newData.CompileDate = DateTime.Now;
+            newData.ProjectId = this.CurrUser.LoginProjectId;
+            if (!string.IsNullOrEmpty(schemePlanId))
+            {
+                newData.SchemePlanId = schemePlanId;
+                BLL.DriverPrepareSchemePlanService.UpdateDriverPrepareDriverPlan(newData);
+            }
+            else
+            {
+                newData.SchemePlanId = SQLHelper.GetNewID(typeof(Model.DriverPrepare_SchemePlan));
+                BLL.DriverPrepareSchemePlanService.AddDriverPrepareDriverPlan(newData);
+            }
+            var items = BLL.DriverPrepareSchemePlanItemService.GetSchemePlanItemByschemePlanId(newData.SchemePlanId);
+            List<string> nameLists = items.Select(x => x.SolutionName).ToList();
+            string[] selectRowId = Grid1.SelectedRowIDArray;
+            foreach (GridRow row in Grid1.Rows)
+            {
+                if (selectRowId.Contains(row.RowID) && !nameLists.Contains(row.DataKeys[1].ToString()))
+                {
+                    Model.DriverPrepare_SchemePlanItem newItem = new Model.DriverPrepare_SchemePlanItem();
+                    newItem.SchemePlanItemId = SQLHelper.GetNewID();
+                    newItem.SchemePlanId = newData.SchemePlanId;
+                    newItem.SolutionName = row.DataKeys[1].ToString();
+                    newItem.SortIndex = row.RowIndex + 1;
+                    BLL.DriverPrepareSchemePlanItemService.AddSchemePlanItem(newItem);
+                }
+            }
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemSelect.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemSelect.aspx.designer.cs
new file mode 100644
index 00000000..cdda17c8
--- /dev/null
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemSelect.aspx.designer.cs
@@ -0,0 +1,96 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.TestRun.DriverPrepare {
+    
+    
+    public partial class SchemePlanItemSelect {
+        
+        /// <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>
+        /// 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>
+        /// rblType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblType;
+        
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+        
+        /// <summary>
+        /// btnAccept 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAccept;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckRectify.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckRectify.aspx.cs
index 7ab17eff..a8703e24 100644
--- a/SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckRectify.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckRectify.aspx.cs
@@ -1,9 +1,12 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
+using System.Linq;
 using System.Text;
 using BLL;
+using Newtonsoft.Json.Linq;
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.ZHGL.ServerCheck
@@ -369,7 +372,7 @@ namespace FineUIPro.Web.ZHGL.ServerCheck
         /// <param name="e"></param>
         protected void btnGet_Click(object sender, EventArgs e)
         {
-            var returnValue = CNCECHSSEWebService.getCheck_CheckRectify();
+            var returnValue = getCheck_CheckRectifyListToSUB();
             if (returnValue.code == 1)
             {
                 ShowNotify(returnValue.message, MessageBoxIcon.Success);
@@ -379,5 +382,144 @@ namespace FineUIPro.Web.ZHGL.ServerCheck
                 Alert.ShowInTop(returnValue.message, MessageBoxIcon.Success);
             }
         }
+
+        #region 获取
+        /// <summary>
+        ///  获取
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public static Model.ResponeData getCheck_CheckRectifyListToSUB()
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                string unitId = CommonService.GetThisUnitId();
+                string baseurl = SysConstSetService.CNCECPath + "/api/HSSEData/getCheckRectify?unitId=" + unitId;
+                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))
+                            {
+                                List<string> ids = new List<string>();
+                                foreach (var item in getData)
+                                {
+                                    string getCheckRectifyId = item["CheckRectifyId"].ToString();
+                                    if (!ids.Contains(getCheckRectifyId))
+                                    {
+                                        var newRectify = db.Check_CheckRectify.FirstOrDefault(e => e.CheckRectifyId == getCheckRectifyId);
+                                        if (newRectify == null)
+                                        {
+                                            ids.Add(getCheckRectifyId);
+                                            Model.Check_CheckRectify newCheckRectify = new Model.Check_CheckRectify
+                                            {
+                                                CheckRectifyId = getCheckRectifyId,
+                                                CheckRectifyCode = item["CheckRectifyCode"].ToString(),
+                                                ProjectId = item["ProjectId"].ToString(),
+                                                UnitId = unitId,
+                                                CheckDate = Funs.GetNewDateTime(item["CheckDate"].ToString()),
+                                                IssueMan = item["IssueMan"].ToString(),
+                                                IssueDate = Funs.GetNewDateTime(item["IssueDate"].ToString()),
+                                                HandleState = item["HandleState"].ToString()
+                                            };
+                                            db.Check_CheckRectify.InsertOnSubmit(newCheckRectify);
+                                            db.SubmitChanges();
+                                        }
+                                        else
+                                        {
+                                            newRectify.CheckRectifyCode = item["CheckRectifyCode"].ToString();
+                                            db.SubmitChanges();
+                                        }
+
+                                        //获取对应主表主键的明细集合
+                                        string getTable5ItemId = item["Table5ItemId"].ToString();
+                                        var oldItem5 = db.Check_CheckInfo_Table5Item.FirstOrDefault(x => x.ID == getTable5ItemId);
+                                        if (oldItem5 == null)
+                                        {
+
+                                            Model.Check_CheckInfo_Table5Item newCheckRectifyItem = new Model.Check_CheckInfo_Table5Item
+                                            {
+                                                ID = getTable5ItemId,
+                                                SortIndex = Funs.GetNewInt(item["SortIndex"].ToString()),
+                                                WorkType = item["WorkType"].ToString(),
+                                                DangerPoint = item["DangerPoint"].ToString(),
+                                                RiskExists = item["RiskExists"].ToString(),
+                                                IsProject = Convert.ToBoolean(item["IsProject"].ToString()),
+                                                CheckMan = item["CheckMan"].ToString(),
+                                                SubjectUnitMan = item["SubjectUnitMan"].ToString(),
+                                            };
+                                            db.Check_CheckInfo_Table5Item.InsertOnSubmit(newCheckRectifyItem);
+                                            db.SubmitChanges();
+                                        }
+
+                                        BLL.CommonService.DeleteAttachFileById(getTable5ItemId);//删除附件
+                                                                                                ////上传附件
+                                        string getAttachFileId = item["AttachFileId"].ToString();
+                                        if (!string.IsNullOrEmpty(getAttachFileId))
+                                        {
+                                            JArray byteList = item["FileContext"] as JArray;
+                                            List<byte[]> resultList = new List<byte[]>();
+                                            foreach (JToken token in byteList)
+                                            {
+                                                byte[] byteArray = Convert.FromBase64String(token.ToString());
+                                                resultList.Add(byteArray);
+                                            }
+
+                                            //List<byte[]> fileContext = new List<byte[]>();
+                                            //fileContext.Add(Convert.FromBase64String(item["FileContext"].ToString()));
+                                            BLL.FileInsertService.InsertAttachFile(getAttachFileId, getTable5ItemId, item["AttachSource"].ToString(), item["AttachUrl"].ToString(), resultList);
+                                        }
+
+                                        string getCheckRectifyItemId = item["CheckRectifyItemId"].ToString();
+                                        var oldItem = db.Check_CheckRectifyItem.FirstOrDefault(e => e.CheckRectifyItemId == getCheckRectifyItemId);
+                                        if (oldItem == null)
+                                        {
+                                            Model.Check_CheckRectifyItem newCheckRectifyItem = new Model.Check_CheckRectifyItem
+                                            {
+                                                CheckRectifyItemId = getCheckRectifyItemId,
+                                                CheckRectifyId = getCheckRectifyId,
+                                                Table5ItemId = getTable5ItemId,
+                                                ConfirmMan = item["ConfirmMan"].ToString(),
+                                                ConfirmDate = Funs.GetNewDateTime(item["ConfirmDate"].ToString()),
+                                                OrderEndDate = Funs.GetNewDateTime(item["OrderEndDate"].ToString()),
+                                                OrderEndPerson = item["OrderEndPerson"].ToString(),
+                                                RealEndDate = Funs.GetNewDateTime(item["RealEndDate"].ToString()),
+                                            };
+
+                                            db.Check_CheckRectifyItem.InsertOnSubmit(newCheckRectifyItem);
+                                            db.SubmitChanges();
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        responeData.message = "获取成功：整改明细记录" + getData.Count().ToString() + "条";
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = "获取失败：" + ex.Message;
+                ErrLogInfo.WriteLog("安全监督检查通知单获取！", ex);
+            }
+
+            return responeData;
+        }
+        #endregion
     }
 }
\ 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 dd0bd095..878e59cc 100644
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
@@ -64,7 +64,7 @@ namespace FineUIPro.Web.common
                 //修改：增加博晟教育中的人数
                 var boShengCount = db.Bo_Sheng_TrainPerson.Where(x => x.ProjectId == ProjectId && (x.DeleteTag == "False" || x.DeleteTag == null)).ToList().Count;
 
-                this.divSafePersonNum.InnerHtml = (getTrainRecord+ boShengCount).ToString();
+                this.divSafePersonNum.InnerHtml = (getTrainRecord + boShengCount).ToString();
 
                 //安全管理人员
                 var allSum = from x in Funs.DB.SitePerson_Person
@@ -592,18 +592,18 @@ namespace FineUIPro.Web.common
         protected string zggjzglDataValue;
         protected void getZlgj()
         {
-            //Check_JointCheck
-            zlgjallNumber = (from x in Funs.DB.Check_JointCheck
-                             where x.CheckDate <= DateTime.Now && x.ProjectId == ProjectId
+            Model.SGGLDB db = Funs.DB;
+            zlgjallNumber = (from x in db.ProcessControl_InspectionManagement
+                             where x.ProjectId == ProjectId
                              select x).Count().ToString();
 
-            var num2 = (from x in Funs.DB.Check_JointCheck
-                        where x.CheckDate <= DateTime.Now && x.State == BLL.Const.JointCheck_Complete && x.ProjectId == ProjectId
+            var num2 = (from x in db.ProcessControl_InspectionManagement
+                        where x.IsOnceQualified == true && x.ProjectId == ProjectId
                         select x).Count();
             zlgjfinishNumber = num2.ToString();
 
-            var num3 = (from x in Funs.DB.Check_JointCheck
-                        where x.CheckDate <= DateTime.Now && x.State != BLL.Const.JointCheck_Complete && x.ProjectId == ProjectId
+            var num3 = (from x in db.ProcessControl_InspectionManagement
+                        where (x.IsOnceQualified == false || x.IsOnceQualified == null) && x.ProjectId == ProjectId
                         select x).Count();
             var zgl = "0";
             if (num2 != 0)
@@ -674,7 +674,7 @@ namespace FineUIPro.Web.common
             else
             {
                 var data = (from x in db.HJGL_FL_Data where x.ProjectId == ProjectId orderby x.CompileDate descending select x).FirstOrDefault();
-                if(data!=null)
+                if (data != null)
                 {
                     decimal a = Funs.GetNewDecimalOrZero(data.OneTimeFilmQualifiedAmount);
                     decimal b = Funs.GetNewDecimalOrZero(data.OneTimeFilmAmount);
diff --git a/SGGL/Model/APIItem/CNCEC/CheckRectifyItem.cs b/SGGL/Model/APIItem/CNCEC/CheckRectifyItem.cs
new file mode 100644
index 00000000..611cfeb0
--- /dev/null
+++ b/SGGL/Model/APIItem/CNCEC/CheckRectifyItem.cs
@@ -0,0 +1,266 @@
+namespace Model
+{
+    using System;
+    using System.Collections.Generic;
+
+    public class CheckRectifyItem
+    {
+        /// <summary>
+        /// 整改id
+        /// </summary>
+        
+        public string CheckRectifyId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 编号
+        /// </summary>
+       
+        public string CheckRectifyCode
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 检查项目
+        /// </summary>
+       
+        public string ProjectId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 单位
+        /// </summary>
+       
+        public string UnitId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 检查日期
+        /// </summary>
+       
+        public DateTime? CheckDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 签发人
+        /// </summary>
+       
+        public string IssueMan
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 签发日期
+        /// </summary>
+       
+        public DateTime? IssueDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 处理状态
+        /// </summary>
+       
+        public string HandleState
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 明细id
+        /// </summary>
+       
+        public string CheckRectifyItemId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 检查隐患表
+        /// </summary>
+       
+        public string Table5ItemId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 立项人
+        /// </summary>
+       
+        public string ConfirmMan
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 立项日期
+        /// </summary>
+       
+        public DateTime? ConfirmDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 要求消项日期
+        /// </summary>
+       
+        public DateTime? OrderEndDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 要求消项责任人
+        /// </summary>
+       
+        public string OrderEndPerson
+        {
+            get;
+            set;
+        } 
+        /// <summary>
+        /// 企业管理部门验证人
+        /// </summary>
+       
+        public string Verification
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 实际消项日期
+        /// </summary>
+       
+        public DateTime? RealEndDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 序号
+        /// </summary>
+       
+        public int? SortIndex
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 类别
+        /// </summary>
+       
+        public string WorkType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 隐患源点
+        /// </summary>
+       
+        public string DangerPoint
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 存在危险
+        /// </summary>
+       
+        public string RiskExists
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否立项
+        /// </summary>
+       
+        public bool? IsProject
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 检查人
+        /// </summary>
+       
+        public string CheckMan
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 单位负责人确认
+        /// </summary>
+       
+        public string SubjectUnitMan
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        ///附件字节
+        /// </summary>
+       
+        public List<byte[]> FileContext
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        ///附件表主键
+        /// </summary>
+       
+        public string AttachFileId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        ///对应主键
+        /// </summary>
+       
+        public string ToKeyId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        ///附件转换
+        /// </summary>
+       
+        public string AttachSource
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 附件路径
+        /// </summary>
+       
+        public string AttachUrl
+        {
+            get;
+            set;
+        }
+    }
+}
diff --git a/SGGL/Model/APIItem/CNCEC/SubUnitReportItemItem.cs b/SGGL/Model/APIItem/CNCEC/SubUnitReportItemItem.cs
new file mode 100644
index 00000000..0143d4ae
--- /dev/null
+++ b/SGGL/Model/APIItem/CNCEC/SubUnitReportItemItem.cs
@@ -0,0 +1,132 @@
+using System;
+using System.Collections.Generic;
+
+namespace Model
+{
+    public class SubUnitReportItemItem
+    {
+        /// <summary>
+        /// 子公司上传明细id
+        /// </summary>
+       
+        public string SubUnitReportItemId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 子公司上传id
+        /// </summary>
+       
+        public string SubUnitReportId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 子单位
+        /// </summary>
+       
+        public string UnitId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 要求上报时间
+        /// </summary>
+       
+        public DateTime? PlanReortDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 标题
+        /// </summary>
+       
+        public string ReportTitle
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 内容
+        /// </summary>
+       
+        public string ReportContent
+        {
+            get;
+            set;
+        }        
+        /// <summary>
+        /// 上报时间
+        /// </summary>
+       
+        public DateTime? ReportDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 状态
+        /// </summary>
+       
+        public string State
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 附件字节
+        /// </summary>
+       
+        public List<byte[]> FileContext
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        ///附件表主键
+        /// </summary>
+       
+        public string AttachFileId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        ///对应主键
+        /// </summary>
+       
+        public string ToKeyId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        ///附件转换
+        /// </summary>
+       
+        public string AttachSource
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 附件路径
+        /// </summary>
+       
+        public string AttachUrl
+        {
+            get;
+            set;
+        }
+    }
+}
diff --git a/SGGL/Model/APIItem/CNCEC/UpCheckReportItem.cs b/SGGL/Model/APIItem/CNCEC/UpCheckReportItem.cs
new file mode 100644
index 00000000..58b00573
--- /dev/null
+++ b/SGGL/Model/APIItem/CNCEC/UpCheckReportItem.cs
@@ -0,0 +1,142 @@
+using System;
+using System.Collections.Generic;
+
+namespace Model
+{
+    public class UpCheckReportItem
+    {
+        /// <summary>
+        /// id
+        /// </summary>
+        
+        public string UpCheckReportId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 单位id
+        /// </summary>
+        
+        public string UnitId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 检查开始时间
+        /// </summary>
+        
+        public DateTime? CheckStartTime
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 检查结束时间
+        /// </summary>
+        
+        public DateTime? CheckEndTime
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 评价目的
+        /// </summary>
+        
+        public string Values1
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 依据
+        /// </summary>
+        
+        public string Values2
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 被评价单位（项目）概况
+        /// </summary>
+        
+        public string Values3
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 符合项
+        /// </summary>
+        
+        public string Values4
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 不符合项
+        /// </summary>
+        
+        public string Values5
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 观察项
+        /// </summary>
+        
+        public string Values6
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 改进建议
+        /// </summary>
+        
+        public string Values7
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 编制日期
+        /// </summary>
+        
+        public DateTime? CompileDate
+        {
+            get;
+            set;
+        }
+        
+        /// <summary>
+        /// 审核时间
+        /// </summary>
+        
+        public DateTime? AuditDate
+        {
+            get;
+            set;
+        }
+
+        public List<Model.UpCheckReportItemItem> item1
+        {
+            get;
+            set;
+        }
+
+        public List<Model.UpCheckReportItemItem2> item2
+        {
+            get;
+            set;
+        }
+    }
+}
diff --git a/SGGL/Model/APIItem/CNCEC/UpCheckReportItemItem.cs b/SGGL/Model/APIItem/CNCEC/UpCheckReportItemItem.cs
new file mode 100644
index 00000000..82d1a65a
--- /dev/null
+++ b/SGGL/Model/APIItem/CNCEC/UpCheckReportItemItem.cs
@@ -0,0 +1,98 @@
+using System;
+
+namespace Model
+{
+    public class UpCheckReportItemItem
+    {
+        /// <summary>
+        /// 评价组成员表id
+        /// </summary>
+        
+        public string UpCheckReportItemId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 评价id
+        /// </summary>
+        
+        public string UpCheckReportId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 序号
+        /// </summary>
+        
+        public string SortIndex
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 名字
+        /// </summary>
+        
+        public string Name
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 性别
+        /// </summary>
+        
+        public string Sex
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 所在单位名称
+        /// </summary>
+        
+        public string UnitName
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 职务
+        /// </summary>
+        
+        public string PostName
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 职称
+        /// </summary>
+        
+        public string WorkTitle
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 评价小组职务
+        /// </summary>
+        
+        public string CheckPostName
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 评价时间
+        /// </summary>
+        
+        public DateTime? CheckDate
+        {
+            get;
+            set;
+        }
+    }
+}
diff --git a/SGGL/Model/APIItem/CNCEC/UpCheckReportItemItem2.cs b/SGGL/Model/APIItem/CNCEC/UpCheckReportItemItem2.cs
new file mode 100644
index 00000000..167fd2aa
--- /dev/null
+++ b/SGGL/Model/APIItem/CNCEC/UpCheckReportItemItem2.cs
@@ -0,0 +1,134 @@
+using System;
+
+namespace Model
+{
+    public class UpCheckReportItemItem2
+    {
+        /// <summary>
+        /// 检查明细id
+        /// </summary>
+        
+        public string UpCheckReportItem2Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 评价id
+        /// </summary>
+        
+        public string UpCheckReportId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 序号
+        /// </summary>
+        
+        public string SortIndex
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 受检对象
+        /// </summary>
+        
+        public string SubjectObject
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 受检对象信息
+        /// </summary>
+        
+        public string SubjectObjectInfo
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 负责人
+        /// </summary>
+        
+        public string UnitMan
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 负责人电话
+        /// </summary>
+        
+        public string UnitManTel
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 安全专职管理人
+        /// </summary>
+        
+        public string UnitHSSEMan
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 安全专职管理人电话
+        /// </summary>
+        
+        public string UnitHSSEManTel
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 检查时间
+        /// </summary>
+        
+        public DateTime? CheckDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 隐患数
+        /// </summary>
+        
+        public int? RectifyCount
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 整改数
+        /// </summary>
+        
+        public int? CompRectifyCount
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 总得分
+        /// </summary>
+        
+        public decimal? TotalGetScore
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 结果等级
+        /// </summary>
+        
+        public string ResultLevel
+        {
+            get;
+            set;
+        }
+    }
+}
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index b57b3694..a3aaaa07 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -743,6 +743,9 @@ namespace Model
     partial void InsertDriverPrepare_DriverData(DriverPrepare_DriverData instance);
     partial void UpdateDriverPrepare_DriverData(DriverPrepare_DriverData instance);
     partial void DeleteDriverPrepare_DriverData(DriverPrepare_DriverData instance);
+    partial void InsertDriverPrepare_DriverDataType(DriverPrepare_DriverDataType instance);
+    partial void UpdateDriverPrepare_DriverDataType(DriverPrepare_DriverDataType instance);
+    partial void DeleteDriverPrepare_DriverDataType(DriverPrepare_DriverDataType instance);
     partial void InsertDriverPrepare_DriverPersonPlan(DriverPrepare_DriverPersonPlan instance);
     partial void UpdateDriverPrepare_DriverPersonPlan(DriverPrepare_DriverPersonPlan instance);
     partial void DeleteDriverPrepare_DriverPersonPlan(DriverPrepare_DriverPersonPlan instance);
@@ -752,9 +755,15 @@ namespace Model
     partial void InsertDriverPrepare_Duty(DriverPrepare_Duty instance);
     partial void UpdateDriverPrepare_Duty(DriverPrepare_Duty instance);
     partial void DeleteDriverPrepare_Duty(DriverPrepare_Duty instance);
+    partial void InsertDriverPrepare_DutyItem(DriverPrepare_DutyItem instance);
+    partial void UpdateDriverPrepare_DutyItem(DriverPrepare_DutyItem instance);
+    partial void DeleteDriverPrepare_DutyItem(DriverPrepare_DutyItem instance);
     partial void InsertDriverPrepare_SchemePlan(DriverPrepare_SchemePlan instance);
     partial void UpdateDriverPrepare_SchemePlan(DriverPrepare_SchemePlan instance);
     partial void DeleteDriverPrepare_SchemePlan(DriverPrepare_SchemePlan instance);
+    partial void InsertDriverPrepare_SchemePlanItem(DriverPrepare_SchemePlanItem instance);
+    partial void UpdateDriverPrepare_SchemePlanItem(DriverPrepare_SchemePlanItem instance);
+    partial void DeleteDriverPrepare_SchemePlanItem(DriverPrepare_SchemePlanItem instance);
     partial void InsertDriverRun_DriverRun(DriverRun_DriverRun instance);
     partial void UpdateDriverRun_DriverRun(DriverRun_DriverRun instance);
     partial void DeleteDriverRun_DriverRun(DriverRun_DriverRun instance);
@@ -4398,6 +4407,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<DriverPrepare_DriverDataType> DriverPrepare_DriverDataType
+		{
+			get
+			{
+				return this.GetTable<DriverPrepare_DriverDataType>();
+			}
+		}
+		
 		public System.Data.Linq.Table<DriverPrepare_DriverPersonPlan> DriverPrepare_DriverPersonPlan
 		{
 			get
@@ -4422,6 +4439,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<DriverPrepare_DutyItem> DriverPrepare_DutyItem
+		{
+			get
+			{
+				return this.GetTable<DriverPrepare_DutyItem>();
+			}
+		}
+		
 		public System.Data.Linq.Table<DriverPrepare_SchemePlan> DriverPrepare_SchemePlan
 		{
 			get
@@ -4430,6 +4455,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<DriverPrepare_SchemePlanItem> DriverPrepare_SchemePlanItem
+		{
+			get
+			{
+				return this.GetTable<DriverPrepare_SchemePlanItem>();
+			}
+		}
+		
 		public System.Data.Linq.Table<DriverRun_DriverRun> DriverRun_DriverRun
 		{
 			get
@@ -25408,6 +25441,8 @@ namespace Model
 		
 		private EntitySet<DriverPrepare_DriverData> _DriverPrepare_DriverData;
 		
+		private EntitySet<DriverPrepare_DriverDataType> _DriverPrepare_DriverDataType;
+		
 		private EntitySet<DriverPrepare_DriverPersonPlan> _DriverPrepare_DriverPersonPlan;
 		
 		private EntitySet<DriverPrepare_DriverPlan> _DriverPrepare_DriverPlan;
@@ -25982,6 +26017,7 @@ namespace Model
 			this._DriverHse_RoadMap = new EntitySet<DriverHse_RoadMap>(new Action<DriverHse_RoadMap>(this.attach_DriverHse_RoadMap), new Action<DriverHse_RoadMap>(this.detach_DriverHse_RoadMap));
 			this._DriverPrepare_ConStudy = new EntitySet<DriverPrepare_ConStudy>(new Action<DriverPrepare_ConStudy>(this.attach_DriverPrepare_ConStudy), new Action<DriverPrepare_ConStudy>(this.detach_DriverPrepare_ConStudy));
 			this._DriverPrepare_DriverData = new EntitySet<DriverPrepare_DriverData>(new Action<DriverPrepare_DriverData>(this.attach_DriverPrepare_DriverData), new Action<DriverPrepare_DriverData>(this.detach_DriverPrepare_DriverData));
+			this._DriverPrepare_DriverDataType = new EntitySet<DriverPrepare_DriverDataType>(new Action<DriverPrepare_DriverDataType>(this.attach_DriverPrepare_DriverDataType), new Action<DriverPrepare_DriverDataType>(this.detach_DriverPrepare_DriverDataType));
 			this._DriverPrepare_DriverPersonPlan = new EntitySet<DriverPrepare_DriverPersonPlan>(new Action<DriverPrepare_DriverPersonPlan>(this.attach_DriverPrepare_DriverPersonPlan), new Action<DriverPrepare_DriverPersonPlan>(this.detach_DriverPrepare_DriverPersonPlan));
 			this._DriverPrepare_DriverPlan = new EntitySet<DriverPrepare_DriverPlan>(new Action<DriverPrepare_DriverPlan>(this.attach_DriverPrepare_DriverPlan), new Action<DriverPrepare_DriverPlan>(this.detach_DriverPrepare_DriverPlan));
 			this._DriverPrepare_Duty = new EntitySet<DriverPrepare_Duty>(new Action<DriverPrepare_Duty>(this.attach_DriverPrepare_Duty), new Action<DriverPrepare_Duty>(this.detach_DriverPrepare_Duty));
@@ -28228,6 +28264,19 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_DriverPrepare_DriverDataType_Base_Project", Storage="_DriverPrepare_DriverDataType", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
+		public EntitySet<DriverPrepare_DriverDataType> DriverPrepare_DriverDataType
+		{
+			get
+			{
+				return this._DriverPrepare_DriverDataType;
+			}
+			set
+			{
+				this._DriverPrepare_DriverDataType.Assign(value);
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_DriverPrepare_DriverPersonPlan_Base_Project", Storage="_DriverPrepare_DriverPersonPlan", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
 		public EntitySet<DriverPrepare_DriverPersonPlan> DriverPrepare_DriverPersonPlan
 		{
@@ -31889,6 +31938,18 @@ namespace Model
 			entity.Base_Project = null;
 		}
 		
+		private void attach_DriverPrepare_DriverDataType(DriverPrepare_DriverDataType entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Project = this;
+		}
+		
+		private void detach_DriverPrepare_DriverDataType(DriverPrepare_DriverDataType entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Project = null;
+		}
+		
 		private void attach_DriverPrepare_DriverPersonPlan(DriverPrepare_DriverPersonPlan entity)
 		{
 			this.SendPropertyChanging();
@@ -124372,6 +124433,8 @@ namespace Model
 		
 		private string _Remark;
 		
+		private string _DriverDataTypeId;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
     #region 可扩展性方法定义
@@ -124390,6 +124453,8 @@ namespace Model
     partial void OnAttachUrlChanged();
     partial void OnRemarkChanging(string value);
     partial void OnRemarkChanged();
+    partial void OnDriverDataTypeIdChanging(string value);
+    partial void OnDriverDataTypeIdChanged();
     #endregion
 		
 		public DriverPrepare_DriverData()
@@ -124522,6 +124587,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DriverDataTypeId", DbType="NVarChar(50)")]
+		public string DriverDataTypeId
+		{
+			get
+			{
+				return this._DriverDataTypeId;
+			}
+			set
+			{
+				if ((this._DriverDataTypeId != value))
+				{
+					this.OnDriverDataTypeIdChanging(value);
+					this.SendPropertyChanging();
+					this._DriverDataTypeId = value;
+					this.SendPropertyChanged("DriverDataTypeId");
+					this.OnDriverDataTypeIdChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_DriverPrepare_DriverData_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -124577,6 +124662,205 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.DriverPrepare_DriverDataType")]
+	public partial class DriverPrepare_DriverDataType : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _DriverDataTypeId;
+		
+		private string _ProjectId;
+		
+		private string _DriverDataTypeCode;
+		
+		private string _DriverDataTypeName;
+		
+		private string _ParentId;
+		
+		private EntityRef<Base_Project> _Base_Project;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnDriverDataTypeIdChanging(string value);
+    partial void OnDriverDataTypeIdChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
+    partial void OnDriverDataTypeCodeChanging(string value);
+    partial void OnDriverDataTypeCodeChanged();
+    partial void OnDriverDataTypeNameChanging(string value);
+    partial void OnDriverDataTypeNameChanged();
+    partial void OnParentIdChanging(string value);
+    partial void OnParentIdChanged();
+    #endregion
+		
+		public DriverPrepare_DriverDataType()
+		{
+			this._Base_Project = default(EntityRef<Base_Project>);
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DriverDataTypeId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string DriverDataTypeId
+		{
+			get
+			{
+				return this._DriverDataTypeId;
+			}
+			set
+			{
+				if ((this._DriverDataTypeId != value))
+				{
+					this.OnDriverDataTypeIdChanging(value);
+					this.SendPropertyChanging();
+					this._DriverDataTypeId = value;
+					this.SendPropertyChanged("DriverDataTypeId");
+					this.OnDriverDataTypeIdChanged();
+				}
+			}
+		}
+		
+		[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="_DriverDataTypeCode", DbType="NVarChar(50)")]
+		public string DriverDataTypeCode
+		{
+			get
+			{
+				return this._DriverDataTypeCode;
+			}
+			set
+			{
+				if ((this._DriverDataTypeCode != value))
+				{
+					this.OnDriverDataTypeCodeChanging(value);
+					this.SendPropertyChanging();
+					this._DriverDataTypeCode = value;
+					this.SendPropertyChanged("DriverDataTypeCode");
+					this.OnDriverDataTypeCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DriverDataTypeName", DbType="NVarChar(50)")]
+		public string DriverDataTypeName
+		{
+			get
+			{
+				return this._DriverDataTypeName;
+			}
+			set
+			{
+				if ((this._DriverDataTypeName != value))
+				{
+					this.OnDriverDataTypeNameChanging(value);
+					this.SendPropertyChanging();
+					this._DriverDataTypeName = value;
+					this.SendPropertyChanged("DriverDataTypeName");
+					this.OnDriverDataTypeNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ParentId", DbType="NVarChar(50)")]
+		public string ParentId
+		{
+			get
+			{
+				return this._ParentId;
+			}
+			set
+			{
+				if ((this._ParentId != value))
+				{
+					this.OnParentIdChanging(value);
+					this.SendPropertyChanging();
+					this._ParentId = value;
+					this.SendPropertyChanged("ParentId");
+					this.OnParentIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_DriverPrepare_DriverDataType_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.DriverPrepare_DriverDataType.Remove(this);
+					}
+					this._Base_Project.Entity = value;
+					if ((value != null))
+					{
+						value.DriverPrepare_DriverDataType.Add(this);
+						this._ProjectId = value.ProjectId;
+					}
+					else
+					{
+						this._ProjectId = default(string);
+					}
+					this.SendPropertyChanged("Base_Project");
+				}
+			}
+		}
+		
+		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.DriverPrepare_DriverPersonPlan")]
 	public partial class DriverPrepare_DriverPersonPlan : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -125444,7 +125728,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DutyName", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DutyName", DbType="NVarChar(50)")]
 		public string DutyName
 		{
 			get
@@ -125464,7 +125748,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DutyCode", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DutyCode", DbType="NVarChar(50)")]
 		public string DutyCode
 		{
 			get
@@ -125657,6 +125941,524 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.DriverPrepare_DutyItem")]
+	public partial class DriverPrepare_DutyItem : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _DutyItemId;
+		
+		private string _DutyId;
+		
+		private string _Stage;
+		
+		private System.Nullable<int> _Code;
+		
+		private string _ActivityContent;
+		
+		private System.Nullable<bool> _Item1;
+		
+		private System.Nullable<bool> _Item2;
+		
+		private System.Nullable<bool> _Item3;
+		
+		private System.Nullable<bool> _Item4;
+		
+		private System.Nullable<bool> _Item5;
+		
+		private System.Nullable<bool> _Item6;
+		
+		private System.Nullable<bool> _Item7;
+		
+		private System.Nullable<bool> _Item8;
+		
+		private System.Nullable<bool> _Item9;
+		
+		private System.Nullable<bool> _Item10;
+		
+		private System.Nullable<bool> _Item11;
+		
+		private System.Nullable<bool> _Item12;
+		
+		private System.Nullable<bool> _Item13;
+		
+		private System.Nullable<bool> _Item14;
+		
+		private string _Remark;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnDutyItemIdChanging(string value);
+    partial void OnDutyItemIdChanged();
+    partial void OnDutyIdChanging(string value);
+    partial void OnDutyIdChanged();
+    partial void OnStageChanging(string value);
+    partial void OnStageChanged();
+    partial void OnCodeChanging(System.Nullable<int> value);
+    partial void OnCodeChanged();
+    partial void OnActivityContentChanging(string value);
+    partial void OnActivityContentChanged();
+    partial void OnItem1Changing(System.Nullable<bool> value);
+    partial void OnItem1Changed();
+    partial void OnItem2Changing(System.Nullable<bool> value);
+    partial void OnItem2Changed();
+    partial void OnItem3Changing(System.Nullable<bool> value);
+    partial void OnItem3Changed();
+    partial void OnItem4Changing(System.Nullable<bool> value);
+    partial void OnItem4Changed();
+    partial void OnItem5Changing(System.Nullable<bool> value);
+    partial void OnItem5Changed();
+    partial void OnItem6Changing(System.Nullable<bool> value);
+    partial void OnItem6Changed();
+    partial void OnItem7Changing(System.Nullable<bool> value);
+    partial void OnItem7Changed();
+    partial void OnItem8Changing(System.Nullable<bool> value);
+    partial void OnItem8Changed();
+    partial void OnItem9Changing(System.Nullable<bool> value);
+    partial void OnItem9Changed();
+    partial void OnItem10Changing(System.Nullable<bool> value);
+    partial void OnItem10Changed();
+    partial void OnItem11Changing(System.Nullable<bool> value);
+    partial void OnItem11Changed();
+    partial void OnItem12Changing(System.Nullable<bool> value);
+    partial void OnItem12Changed();
+    partial void OnItem13Changing(System.Nullable<bool> value);
+    partial void OnItem13Changed();
+    partial void OnItem14Changing(System.Nullable<bool> value);
+    partial void OnItem14Changed();
+    partial void OnRemarkChanging(string value);
+    partial void OnRemarkChanged();
+    #endregion
+		
+		public DriverPrepare_DutyItem()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DutyItemId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string DutyItemId
+		{
+			get
+			{
+				return this._DutyItemId;
+			}
+			set
+			{
+				if ((this._DutyItemId != value))
+				{
+					this.OnDutyItemIdChanging(value);
+					this.SendPropertyChanging();
+					this._DutyItemId = value;
+					this.SendPropertyChanged("DutyItemId");
+					this.OnDutyItemIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DutyId", DbType="NVarChar(50)")]
+		public string DutyId
+		{
+			get
+			{
+				return this._DutyId;
+			}
+			set
+			{
+				if ((this._DutyId != value))
+				{
+					this.OnDutyIdChanging(value);
+					this.SendPropertyChanging();
+					this._DutyId = value;
+					this.SendPropertyChanged("DutyId");
+					this.OnDutyIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Stage", DbType="NVarChar(50)")]
+		public string Stage
+		{
+			get
+			{
+				return this._Stage;
+			}
+			set
+			{
+				if ((this._Stage != value))
+				{
+					this.OnStageChanging(value);
+					this.SendPropertyChanging();
+					this._Stage = value;
+					this.SendPropertyChanged("Stage");
+					this.OnStageChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Code", DbType="Int")]
+		public System.Nullable<int> Code
+		{
+			get
+			{
+				return this._Code;
+			}
+			set
+			{
+				if ((this._Code != value))
+				{
+					this.OnCodeChanging(value);
+					this.SendPropertyChanging();
+					this._Code = value;
+					this.SendPropertyChanged("Code");
+					this.OnCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActivityContent", DbType="NVarChar(50)")]
+		public string ActivityContent
+		{
+			get
+			{
+				return this._ActivityContent;
+			}
+			set
+			{
+				if ((this._ActivityContent != value))
+				{
+					this.OnActivityContentChanging(value);
+					this.SendPropertyChanging();
+					this._ActivityContent = value;
+					this.SendPropertyChanged("ActivityContent");
+					this.OnActivityContentChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Item1", DbType="Bit")]
+		public System.Nullable<bool> Item1
+		{
+			get
+			{
+				return this._Item1;
+			}
+			set
+			{
+				if ((this._Item1 != value))
+				{
+					this.OnItem1Changing(value);
+					this.SendPropertyChanging();
+					this._Item1 = value;
+					this.SendPropertyChanged("Item1");
+					this.OnItem1Changed();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Item2", DbType="Bit")]
+		public System.Nullable<bool> Item2
+		{
+			get
+			{
+				return this._Item2;
+			}
+			set
+			{
+				if ((this._Item2 != value))
+				{
+					this.OnItem2Changing(value);
+					this.SendPropertyChanging();
+					this._Item2 = value;
+					this.SendPropertyChanged("Item2");
+					this.OnItem2Changed();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Item3", DbType="Bit")]
+		public System.Nullable<bool> Item3
+		{
+			get
+			{
+				return this._Item3;
+			}
+			set
+			{
+				if ((this._Item3 != value))
+				{
+					this.OnItem3Changing(value);
+					this.SendPropertyChanging();
+					this._Item3 = value;
+					this.SendPropertyChanged("Item3");
+					this.OnItem3Changed();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Item4", DbType="Bit")]
+		public System.Nullable<bool> Item4
+		{
+			get
+			{
+				return this._Item4;
+			}
+			set
+			{
+				if ((this._Item4 != value))
+				{
+					this.OnItem4Changing(value);
+					this.SendPropertyChanging();
+					this._Item4 = value;
+					this.SendPropertyChanged("Item4");
+					this.OnItem4Changed();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Item5", DbType="Bit")]
+		public System.Nullable<bool> Item5
+		{
+			get
+			{
+				return this._Item5;
+			}
+			set
+			{
+				if ((this._Item5 != value))
+				{
+					this.OnItem5Changing(value);
+					this.SendPropertyChanging();
+					this._Item5 = value;
+					this.SendPropertyChanged("Item5");
+					this.OnItem5Changed();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Item6", DbType="Bit")]
+		public System.Nullable<bool> Item6
+		{
+			get
+			{
+				return this._Item6;
+			}
+			set
+			{
+				if ((this._Item6 != value))
+				{
+					this.OnItem6Changing(value);
+					this.SendPropertyChanging();
+					this._Item6 = value;
+					this.SendPropertyChanged("Item6");
+					this.OnItem6Changed();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Item7", DbType="Bit")]
+		public System.Nullable<bool> Item7
+		{
+			get
+			{
+				return this._Item7;
+			}
+			set
+			{
+				if ((this._Item7 != value))
+				{
+					this.OnItem7Changing(value);
+					this.SendPropertyChanging();
+					this._Item7 = value;
+					this.SendPropertyChanged("Item7");
+					this.OnItem7Changed();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Item8", DbType="Bit")]
+		public System.Nullable<bool> Item8
+		{
+			get
+			{
+				return this._Item8;
+			}
+			set
+			{
+				if ((this._Item8 != value))
+				{
+					this.OnItem8Changing(value);
+					this.SendPropertyChanging();
+					this._Item8 = value;
+					this.SendPropertyChanged("Item8");
+					this.OnItem8Changed();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Item9", DbType="Bit")]
+		public System.Nullable<bool> Item9
+		{
+			get
+			{
+				return this._Item9;
+			}
+			set
+			{
+				if ((this._Item9 != value))
+				{
+					this.OnItem9Changing(value);
+					this.SendPropertyChanging();
+					this._Item9 = value;
+					this.SendPropertyChanged("Item9");
+					this.OnItem9Changed();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Item10", DbType="Bit")]
+		public System.Nullable<bool> Item10
+		{
+			get
+			{
+				return this._Item10;
+			}
+			set
+			{
+				if ((this._Item10 != value))
+				{
+					this.OnItem10Changing(value);
+					this.SendPropertyChanging();
+					this._Item10 = value;
+					this.SendPropertyChanged("Item10");
+					this.OnItem10Changed();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Item11", DbType="Bit")]
+		public System.Nullable<bool> Item11
+		{
+			get
+			{
+				return this._Item11;
+			}
+			set
+			{
+				if ((this._Item11 != value))
+				{
+					this.OnItem11Changing(value);
+					this.SendPropertyChanging();
+					this._Item11 = value;
+					this.SendPropertyChanged("Item11");
+					this.OnItem11Changed();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Item12", DbType="Bit")]
+		public System.Nullable<bool> Item12
+		{
+			get
+			{
+				return this._Item12;
+			}
+			set
+			{
+				if ((this._Item12 != value))
+				{
+					this.OnItem12Changing(value);
+					this.SendPropertyChanging();
+					this._Item12 = value;
+					this.SendPropertyChanged("Item12");
+					this.OnItem12Changed();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Item13", DbType="Bit")]
+		public System.Nullable<bool> Item13
+		{
+			get
+			{
+				return this._Item13;
+			}
+			set
+			{
+				if ((this._Item13 != value))
+				{
+					this.OnItem13Changing(value);
+					this.SendPropertyChanging();
+					this._Item13 = value;
+					this.SendPropertyChanged("Item13");
+					this.OnItem13Changed();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Item14", DbType="Bit")]
+		public System.Nullable<bool> Item14
+		{
+			get
+			{
+				return this._Item14;
+			}
+			set
+			{
+				if ((this._Item14 != value))
+				{
+					this.OnItem14Changing(value);
+					this.SendPropertyChanging();
+					this._Item14 = value;
+					this.SendPropertyChanged("Item14");
+					this.OnItem14Changed();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(200)")]
+		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();
+				}
+			}
+		}
+		
+		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.DriverPrepare_SchemePlan")]
 	public partial class DriverPrepare_SchemePlan : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -125969,6 +126771,140 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.DriverPrepare_SchemePlanItem")]
+	public partial class DriverPrepare_SchemePlanItem : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _SchemePlanItemId;
+		
+		private string _SchemePlanId;
+		
+		private string _SolutionName;
+		
+		private System.Nullable<int> _SortIndex;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnSchemePlanItemIdChanging(string value);
+    partial void OnSchemePlanItemIdChanged();
+    partial void OnSchemePlanIdChanging(string value);
+    partial void OnSchemePlanIdChanged();
+    partial void OnSolutionNameChanging(string value);
+    partial void OnSolutionNameChanged();
+    partial void OnSortIndexChanging(System.Nullable<int> value);
+    partial void OnSortIndexChanged();
+    #endregion
+		
+		public DriverPrepare_SchemePlanItem()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SchemePlanItemId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string SchemePlanItemId
+		{
+			get
+			{
+				return this._SchemePlanItemId;
+			}
+			set
+			{
+				if ((this._SchemePlanItemId != value))
+				{
+					this.OnSchemePlanItemIdChanging(value);
+					this.SendPropertyChanging();
+					this._SchemePlanItemId = value;
+					this.SendPropertyChanged("SchemePlanItemId");
+					this.OnSchemePlanItemIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SchemePlanId", DbType="NVarChar(50)")]
+		public string SchemePlanId
+		{
+			get
+			{
+				return this._SchemePlanId;
+			}
+			set
+			{
+				if ((this._SchemePlanId != value))
+				{
+					this.OnSchemePlanIdChanging(value);
+					this.SendPropertyChanging();
+					this._SchemePlanId = value;
+					this.SendPropertyChanged("SchemePlanId");
+					this.OnSchemePlanIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SolutionName", DbType="NVarChar(100)")]
+		public string SolutionName
+		{
+			get
+			{
+				return this._SolutionName;
+			}
+			set
+			{
+				if ((this._SolutionName != value))
+				{
+					this.OnSolutionNameChanging(value);
+					this.SendPropertyChanging();
+					this._SolutionName = value;
+					this.SendPropertyChanged("SolutionName");
+					this.OnSolutionNameChanged();
+				}
+			}
+		}
+		
+		[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();
+				}
+			}
+		}
+		
+		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.DriverRun_DriverRun")]
 	public partial class DriverRun_DriverRun : INotifyPropertyChanging, INotifyPropertyChanged
 	{
diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj
index 8321533c..eca26ace 100644
--- a/SGGL/Model/Model.csproj
+++ b/SGGL/Model/Model.csproj
@@ -64,6 +64,11 @@
     <Compile Include="APIItem\BaseInfoItem.cs" />
     <Compile Include="APIItem\ChemicalReport.cs" />
     <Compile Include="APIItem\ChemicalReportItem.cs" />
+    <Compile Include="APIItem\CNCEC\CheckRectifyItem.cs" />
+    <Compile Include="APIItem\CNCEC\SubUnitReportItemItem.cs" />
+    <Compile Include="APIItem\CNCEC\UpCheckReportItem.cs" />
+    <Compile Include="APIItem\CNCEC\UpCheckReportItemItem.cs" />
+    <Compile Include="APIItem\CNCEC\UpCheckReportItemItem2.cs" />
     <Compile Include="APIItem\EnergyReport.cs" />
     <Compile Include="APIItem\EnergyReportItem.cs" />
     <Compile Include="APIItem\EPSummaryReport.cs" />