From a1f0314f7280a58ba20b7277f34baed76e3755d2 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 24 Jan 2024 09:17:17 +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

---
 DataBase/版本日志/SGGLDB_WH_2024-01-18.sql    | 299 ++++++++++++++++++
 SGGL/BLL/Common/Const.cs                      |   4 +
 .../DriverPrepareSchemePlanItemService.cs     |   2 +-
 .../File/Excel/TestRun/开车责任分工表.xlsx    | Bin 0 -> 13557 bytes
 .../TestRun/DriverPrepare/Duty.aspx           |   3 +
 .../TestRun/DriverPrepare/Duty.aspx.cs        | 177 +++++++++++
 .../DriverPrepare/Duty.aspx.designer.cs       |   9 +
 .../TestRun/DriverPrepare/DutyEdit.aspx       |  90 +++++-
 .../TestRun/DriverPrepare/DutyEdit.aspx.cs    |  43 +++
 .../DriverPrepare/SchemePlanItemAdd.aspx.cs   |   2 +-
 .../DriverPrepare/SchemePlanItemSelect.aspx   |  16 +
 .../SchemePlanItemSelect.aspx.cs              |  44 ++-
 .../SchemePlanItemSelect.aspx.designer.cs     |  36 +++
 13 files changed, 718 insertions(+), 7 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-01-18.sql
 create mode 100644 SGGL/FineUIPro.Web/File/Excel/TestRun/开车责任分工表.xlsx

diff --git a/DataBase/版本日志/SGGLDB_WH_2024-01-18.sql b/DataBase/版本日志/SGGLDB_WH_2024-01-18.sql
new file mode 100644
index 00000000..6fa5d0ca
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-01-18.sql
@@ -0,0 +1,299 @@
+update DriverPrepare_SchemePlanItem set SchemePlanId='����' where SchemePlanId='�ϳɰ�������Ŀ'
+GO
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'���ù���','����ϵͳ��ɨ����',1)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'���ù���','����ϵͳ��ɨ����',2)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'���ù���','�DZ�������������ɨ����',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(),'���ù���','���˹޳�ϴ������װ���ϴ��Ͷ�÷���',15)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'���ù���','��ȴ���Գ�����',16)
+--insert into DriverPrepare_SchemePlanItem values
+--(NEWID(),'���ù���','ϵͳ��ѧ��ϴ��ԤĤ����',17)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'���ù���','ϵͳ��̬���з���',18)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'���ù���','ϵͳͶ���Գ�����',19)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'���ù���','װ���豸���ܵ���ϴ��©����',20)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'���ù���','������ϴ����',21)
+--insert into DriverPrepare_SchemePlanItem values
+--(NEWID(),'���ù���','ϵͳ���õ����Գ�����',22)
+--insert into DriverPrepare_SchemePlanItem values
+--(NEWID(),'���ù���','��ҩϵͳ�Գ�����',23)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'���ù���','ϵͳ�����Գ�����',24)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�շ�','�DZ���ѹվ�Գ�����',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(),'�շ�','�շֵ�ѹ�������ͷ�����0.4MPa��',9)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�շ�','������ˮ������ϴ����',10)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�շ�','����ɸ��������������Һϵͳ��ϴ����',11)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�շ�','�շִ���ϵͳ����ɸװ�������AL2O3��',12)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�շ�','����ϵͳ����ɸ�̿ص��Լ���������',13)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�շ�','�շ�Ԥ��ϵͳ����װ���',14)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�շ�','�շ�ϵͳ��ɨ�����������ڡ������⣩',15)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�շ�','�շ��������ɰװ���',16)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�շ�','��ѹ����ѹ��������͸ƽ��ϴ����',17)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�շ�','�շֿ�ѹ����ѹ��͸ƽ��ת����',18)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�շ�','�շֿ�ѹ�����Գ�����',19)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�շ�','�廯﮻����Գ�����',20)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�շ�','�������ͻ��Գ�����',21)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�շ�','Һ�����ͻ��Գ�����',22)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�շ�','�۵�ѹ���������Գ�����',23)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�շ�','͸ƽ������ϵͳ��©��������鷽��',24)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�շ�','����Һ�崢������Ͷ�÷���',25)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�շ�','�󱸳���ѹ��ϵͳ�Գ������ͷ���',26)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�շ�','�󱸵�ѹ��ϵͳ�Գ������ͷ���',27)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�շ�','�շ�װ��Ͷ���Գ�����',28)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','���ú���Գ�����',1)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','ú����ϵͳ�����Գ���PLC���Է���',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(),'����','ú���Ʊ�ϵͳ�����Գ�����',15)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','��������Һ��ܵ���ϴ����',16)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','������������ܵ���ɨ����',17)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','������¯ˮ���߳�ϴ����',18)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','�����������ߴ�ɨ����',19)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','������ѭ����ϴ��������շֳ������������γ�ѭ����ϴ��',20)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','������ѹ�������ߴ�ɨ���ܷ���',21)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','��ѹú�����Գ�����',22)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','�������Գ�����',23)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','�������Գ�����',24)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','����¯ԭʼ��¯����',25)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','������ȴˮϵͳ���Է���',26)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','����ϵͳ���Է���',27)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','��չ���ϵͳ�Գ�����',28)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','����۰��ϻ��Գ�����',29)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','����ϵͳ�������鷽��',30)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','����¯��ѹϵͳ���ܷ���',31)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','����ϵͳ���ܷ���',32)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','����¯Ͷ��ǰ�û�����',33)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','����ϵͳ���ܷ���',34)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','����ˮ�����Գ�����',35)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','����װ��Ͷ���Գ�����',36)
+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(),'����','����ѭ����ѹ�����Գ�����',15)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','����ˮ���˷���',16)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','�������״�����������ϵͳ���',17)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','���¼״�ϴ���״�����������',18)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','�״�ѭ��Ԥ�䷽��',19)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','����Ͷ���Գ�����',20)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','Һ��ϴ���������ߴ�ɨ����',21)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','Һ��ϴ�����û�����',22)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','Һ��ϴ���������鷽��',23)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','Һ��ϴ�������䷽��',24)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','Һ��ϴ�������ɰװ���',25)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','Һ��ϴ����ɸװ���',26)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','Һ��ϴ����ɸ�̿�ϵͳ���Լ���������',27)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','Һ��ϴ�����Һ����',28)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','Һ��ϴͶ���Գ�����',29)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','����չ��߳�ϴ��ɨ����',30)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','��������������鷽��',31)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','����շ�������Գ�����',32)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','����մ߻���װ���',33)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','����պ�¯����',34)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','����շϹ����������󷽰�',35)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','����պ�¯����¯����',36)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','����չ�Ͳ�������Գ���������װ������һ��ģ�',37)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'����','�����Ͷ���Գ�����',38)
+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(),'�ϳ�','�ϳ������Գ����� ',15)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�ϳ�','���䶳ϵͳ�䰱����',16)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�ϳ�','�ϳ����߻������»�ԭ����',17)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�ϳ�','�ϳ�װ��Ͷ���Գ�����',18)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�ϳ�','��渨���ܵ���ϴ��ɨ����',19)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�ϳ�','���ϵͳ���ܷ���',20)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�ϳ�','�����õ����Գ�����',21)
+insert into DriverPrepare_SchemePlanItem values
+(NEWID(),'�ϳ�','����Ե�𷽰�',22)
+GO
\ No newline at end of file
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 80f6b286..95863f08 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -3186,6 +3186,10 @@ namespace BLL
         /// 开车方案编制计划模板文件原始虚拟路径
         /// </summary>
         public const string SchemePlanTemplateUrl = "File\\Excel\\TestRun\\开车方案编制计划.xlsx";
+        /// <summary>
+        /// 开车责任分工表模板文件原始虚拟路径
+        /// </summary>
+        public const string DutyTemplateUrl = "File\\Excel\\TestRun\\开车责任分工表.xlsx";
         #endregion
 
         #region 绩效考核模板文件路径
diff --git a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanItemService.cs b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanItemService.cs
index 74690e60..2334bbc3 100644
--- a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanItemService.cs
+++ b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanItemService.cs
@@ -39,7 +39,7 @@ namespace BLL
         /// <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();
+            return (from x in Funs.DB.DriverPrepare_SchemePlanItem where x.SchemePlanId == "公用工程" || x.SchemePlanId == "空分" || x.SchemePlanId == "气化" || x.SchemePlanId == "净化" || x.SchemePlanId == "合成" || x.SchemePlanId == "尿素" || x.SchemePlanId == "磷酸项目" || x.SchemePlanId == "LNG项目" select x).ToList();
         }
 
         /// <summary>
diff --git a/SGGL/FineUIPro.Web/File/Excel/TestRun/开车责任分工表.xlsx b/SGGL/FineUIPro.Web/File/Excel/TestRun/开车责任分工表.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..4919a622544efad25c5b25eb4d5ed75faf93105b
GIT binary patch
literal 13557
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%0AHp#S9xjRkDPi
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

literal 0
HcmV?d00001

diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/Duty.aspx b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/Duty.aspx
index 05579f14..8d5e0d7d 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/Duty.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/Duty.aspx
@@ -38,6 +38,9 @@
                                 </f:Button>
                                 <f:Button ID="btnModify" Icon="Pencil" ToolTip="修改" OnClick="btnMenuModify_Click" runat="server" Hidden="true">
                                 </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
                                 <f:Button ID="btnDel" Icon="Delete" ToolTip="删除" OnClick="btnMenuDel_Click" runat="server" ConfirmText="确定删除当前数据？" Hidden="true">
                                 </f:Button>
                             </Items>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/Duty.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/Duty.aspx.cs
index 66a83189..13fab933 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/Duty.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/Duty.aspx.cs
@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
+using System.IO;
 using System.Linq;
 
 namespace FineUIPro.Web.TestRun.DriverPrepare
@@ -156,5 +157,181 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
             }
         }
         #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            string rootPath = Server.MapPath("~/");
+            string initTemplatePath = string.Empty;
+            string uploadfilepath = string.Empty;
+            string newUrl = string.Empty;
+            string filePath = string.Empty;
+            initTemplatePath = Const.DutyTemplateUrl;
+            uploadfilepath = rootPath + initTemplatePath;
+            var duty = (from x in Funs.DB.DriverPrepare_Duty where x.ProjectId == this.CurrUser.LoginProjectId select x).FirstOrDefault();
+            if (duty != null)
+            {
+                string projectName = BLL.ProjectService.GetProjectNameByProjectId(duty.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.Left;
+                cellStyle0.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center;
+                var font0 = workbook.CreateFont();
+                font0.FontHeightInPoints = 11;
+                font0.IsBold = false;
+                cellStyle0.SetFont(font0);
+                // 第二步：创建新数据行
+                NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0);
+                NPOI.SS.UserModel.IRow row = sheet.GetRow(1);
+                NPOI.SS.UserModel.ICell cell;
+                cell = row.GetCell(3);
+                cell.CellStyle = cellStyle0;
+                cell.SetCellValue("项目名称：" + projectName);
+                var items = BLL.DriverPrepareDutyItemService.GetLists(duty.DutyId);
+                int i = 4;
+                foreach (var item in items)
+                {
+                    // 第二步：创建新数据行
+                    row = sheet.GetRow(i);
+                    // 添加数据
+                    cell = row.GetCell(3);
+                    cell.CellStyle = cellStyle;
+                    if (item.Item1 == true)
+                    {
+                        cell.SetCellValue("√");
+                    }
+                    cell = row.GetCell(4);
+                    cell.CellStyle = cellStyle;
+                    if (item.Item2 == true)
+                    {
+                        cell.SetCellValue("√");
+                    }
+                    cell = row.GetCell(5);
+                    cell.CellStyle = cellStyle;
+                    if (item.Item3 == true)
+                    {
+                        cell.SetCellValue("√");
+                    }
+                    cell = row.GetCell(6);
+                    cell.CellStyle = cellStyle;
+                    if (item.Item4 == true)
+                    {
+                        cell.SetCellValue("√");
+                    }
+                    cell = row.GetCell(7);
+                    cell.CellStyle = cellStyle;
+                    if (item.Item5 == true)
+                    {
+                        cell.SetCellValue("√");
+                    }
+                    cell = row.GetCell(8);
+                    cell.CellStyle = cellStyle;
+                    if (item.Item6 == true)
+                    {
+                        cell.SetCellValue("√");
+                    }
+                    cell = row.GetCell(9);
+                    cell.CellStyle = cellStyle;
+                    if (item.Item7 == true)
+                    {
+                        cell.SetCellValue("√");
+                    }
+                    cell = row.GetCell(10);
+                    cell.CellStyle = cellStyle;
+                    if (item.Item8 == true)
+                    {
+                        cell.SetCellValue("√");
+                    }
+                    cell = row.GetCell(11);
+                    cell.CellStyle = cellStyle;
+                    if (item.Item9 == true)
+                    {
+                        cell.SetCellValue("√");
+                    }
+                    cell = row.GetCell(12);
+                    cell.CellStyle = cellStyle;
+                    if (item.Item10 == true)
+                    {
+                        cell.SetCellValue("√");
+                    }
+                    cell = row.GetCell(13);
+                    cell.CellStyle = cellStyle;
+                    if (item.Item11 == true)
+                    {
+                        cell.SetCellValue("√");
+                    }
+                    cell = row.GetCell(14);
+                    cell.CellStyle = cellStyle;
+                    if (item.Item12 == true)
+                    {
+                        cell.SetCellValue("√");
+                    }
+                    cell = row.GetCell(15);
+                    cell.CellStyle = cellStyle;
+                    if (item.Item13 == true)
+                    {
+                        cell.SetCellValue("√");
+                    }
+                    cell = row.GetCell(16);
+                    cell.CellStyle = cellStyle;
+                    if (item.Item14 == true)
+                    {
+                        cell.SetCellValue("√");
+                    }
+                    cell = row.GetCell(17);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(item.Remark);
+                    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/Duty.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/Duty.aspx.designer.cs
index 6df812db..56f7ecf6 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/Duty.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/Duty.aspx.designer.cs
@@ -75,6 +75,15 @@ namespace FineUIPro.Web.TestRun.DriverPrepare {
         /// </remarks>
         protected global::FineUIPro.Button btnModify;
         
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+        
         /// <summary>
         /// btnDel 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DutyEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DutyEdit.aspx
index 46a68e32..53775706 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DutyEdit.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DutyEdit.aspx
@@ -28,7 +28,7 @@
                     TitleToolTip="开车责任分工表" AutoScroll="true">
                     <Items>
                         <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="开车责任分工表"
-                            EnableCollapse="true" KeepCurrentSelection="true" runat="server" BoxFlex="1"
+                            EnableCollapse="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"
@@ -58,6 +58,90 @@
                                 </f:RenderField>
                                 <f:GroupField ColumnID="c2" HeaderText="责任分工" TextAlign="Center">
                                     <Columns>
+                                        <%--<f:TemplateField ColumnID="Item1" Width="60px" HeaderText="技术文件编制" HeaderTextAlign="Center" TextAlign="Center"
+                                            EnableLock="true" Locked="False">
+                                            <ItemTemplate>
+                                                <asp:CheckBox runat="server" ID="cbItem1" />
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                        <f:TemplateField ColumnID="Item2" Width="60px" HeaderText="操作规程编制" HeaderTextAlign="Center" TextAlign="Center"
+                                            EnableLock="true" Locked="False">
+                                            <ItemTemplate>
+                                                <asp:CheckBox runat="server" ID="cbItem2" />
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                        <f:TemplateField ColumnID="Item3" Width="60px" HeaderText="实施方案编制" HeaderTextAlign="Center" TextAlign="Center"
+                                            EnableLock="true" Locked="False">
+                                            <ItemTemplate>
+                                                <asp:CheckBox runat="server" ID="cbItem3" />
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                        <f:TemplateField ColumnID="Item4" Width="60px" HeaderText="技术指导" HeaderTextAlign="Center" TextAlign="Center"
+                                            EnableLock="true" Locked="False">
+                                            <ItemTemplate>
+                                                <asp:CheckBox runat="server" ID="cbItem4" />
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                        <f:TemplateField ColumnID="Item5" Width="60px" HeaderText="临时措施" HeaderTextAlign="Center" TextAlign="Center"
+                                            EnableLock="true" Locked="False">
+                                            <ItemTemplate>
+                                                <asp:CheckBox runat="server" ID="cbItem5" />
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                        <f:TemplateField ColumnID="Item6" Width="60px" HeaderText="组织指挥" HeaderTextAlign="Center" TextAlign="Center"
+                                            EnableLock="true" Locked="False">
+                                            <ItemTemplate>
+                                                <asp:CheckBox runat="server" ID="cbItem6" />
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                        <f:TemplateField ColumnID="Item7" Width="60px" HeaderText="操作执行" HeaderTextAlign="Center" TextAlign="Center"
+                                            EnableLock="true" Locked="False">
+                                            <ItemTemplate>
+                                                <asp:CheckBox runat="server" ID="cbItem7" />
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                        <f:TemplateField ColumnID="Item8" Width="60px" HeaderText="记录报告" HeaderTextAlign="Center" TextAlign="Center"
+                                            EnableLock="true" Locked="False">
+                                            <ItemTemplate>
+                                                <asp:CheckBox runat="server" ID="cbItem8" />
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                        <f:TemplateField ColumnID="Item9" Width="60px" HeaderText="公用工程保障" HeaderTextAlign="Center" TextAlign="Center"
+                                            EnableLock="true" Locked="False">
+                                            <ItemTemplate>
+                                                <asp:CheckBox runat="server" ID="cbItem9" />
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                        <f:TemplateField ColumnID="Item10" Width="60px" HeaderText="原料供应" HeaderTextAlign="Center" TextAlign="Center"
+                                            EnableLock="true" Locked="False">
+                                            <ItemTemplate>
+                                                <asp:CheckBox runat="server" ID="cbItem10" />
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                        <f:TemplateField ColumnID="Item11" Width="60px" HeaderText="分析化验" HeaderTextAlign="Center" TextAlign="Center"
+                                            EnableLock="true" Locked="False">
+                                            <ItemTemplate>
+                                                <asp:CheckBox runat="server" ID="cbItem11" />
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                        <f:TemplateField ColumnID="Item12" Width="60px" HeaderText="保运" HeaderTextAlign="Center" TextAlign="Center"
+                                            EnableLock="true" Locked="False">
+                                            <ItemTemplate>
+                                                <asp:CheckBox runat="server" ID="cbItem12" />
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                        <f:TemplateField ColumnID="Item13" Width="60px" HeaderText="备品备件供应" HeaderTextAlign="Center" TextAlign="Center"
+                                            EnableLock="true" Locked="False">
+                                            <ItemTemplate>
+                                                <asp:CheckBox runat="server" ID="cbItem13" />
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                        <f:TemplateField ColumnID="Item14" Width="60px" HeaderText="产出物料处置" HeaderTextAlign="Center" TextAlign="Center"
+                                            EnableLock="true" Locked="False">
+                                            <ItemTemplate>
+                                                <asp:CheckBox runat="server" ID="cbItem14" />
+                                            </ItemTemplate>
+                                        </f:TemplateField>--%>
                                         <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" />
@@ -83,8 +167,8 @@
                                 </f:GroupField>
                             </Columns>
                             <Listeners>
-                            <f:Listener Event="dataload" Handler="onGridDataLoad" />
-                        </Listeners>
+                                <f:Listener Event="dataload" Handler="onGridDataLoad" />
+                            </Listeners>
                         </f:Grid>
                     </Items>
                 </f:Panel>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DutyEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DutyEdit.aspx.cs
index a8818dbf..06e032d5 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DutyEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/DutyEdit.aspx.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.TestRun.DriverPrepare
 {
@@ -34,6 +35,8 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
                     }
                     BindGrid();
                 }
+                //Grid1.EnableCheckBoxSelect = true;
+                //Grid1.CheckBoxSelectOnly = true;
             }
         }
         #endregion
@@ -141,6 +144,46 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
                     BLL.DriverPrepareDutyItemService.UpdateDutyItem(item);
                 }
             }
+
+            //int rowsCount = this.Grid1.Rows.Count;
+            //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");
+            //    AspNet.CheckBox cbItem1 = (AspNet.CheckBox)(this.Grid1.Rows[i].FindControl("cbItem1"));
+            //    AspNet.CheckBox cbItem2 = (AspNet.CheckBox)(this.Grid1.Rows[i].FindControl("cbItem2"));
+            //    AspNet.CheckBox cbItem3 = (AspNet.CheckBox)(this.Grid1.Rows[i].FindControl("cbItem3"));
+            //    AspNet.CheckBox cbItem4 = (AspNet.CheckBox)(this.Grid1.Rows[i].FindControl("cbItem4"));
+            //    AspNet.CheckBox cbItem5 = (AspNet.CheckBox)(this.Grid1.Rows[i].FindControl("cbItem5"));
+            //    AspNet.CheckBox cbItem6 = (AspNet.CheckBox)(this.Grid1.Rows[i].FindControl("cbItem6"));
+            //    AspNet.CheckBox cbItem7 = (AspNet.CheckBox)(this.Grid1.Rows[i].FindControl("cbItem7"));
+            //    AspNet.CheckBox cbItem8 = (AspNet.CheckBox)(this.Grid1.Rows[i].FindControl("cbItem8"));
+            //    AspNet.CheckBox cbItem9 = (AspNet.CheckBox)(this.Grid1.Rows[i].FindControl("cbItem9"));
+            //    AspNet.CheckBox cbItem10 = (AspNet.CheckBox)(this.Grid1.Rows[i].FindControl("cbItem10"));
+            //    AspNet.CheckBox cbItem11 = (AspNet.CheckBox)(this.Grid1.Rows[i].FindControl("cbItem11"));
+            //    AspNet.CheckBox cbItem12 = (AspNet.CheckBox)(this.Grid1.Rows[i].FindControl("cbItem12"));
+            //    AspNet.CheckBox cbItem13 = (AspNet.CheckBox)(this.Grid1.Rows[i].FindControl("cbItem13"));
+            //    AspNet.CheckBox cbItem14 = (AspNet.CheckBox)(this.Grid1.Rows[i].FindControl("cbItem14"));
+            //    item.Item1 = cbItem1.Checked;
+            //    item.Item2 = cbItem2.Checked;
+            //    item.Item3 = cbItem3.Checked;
+            //    item.Item4 = cbItem4.Checked;
+            //    item.Item5 = cbItem5.Checked;
+            //    item.Item6 = cbItem6.Checked;
+            //    item.Item7 = cbItem7.Checked;
+            //    item.Item8 = cbItem8.Checked;
+            //    item.Item9 = cbItem9.Checked;
+            //    item.Item10 = cbItem10.Checked;
+            //    item.Item11 = cbItem11.Checked;
+            //    item.Item12 = cbItem12.Checked;
+            //    item.Item13 = cbItem13.Checked;
+            //    item.Item14 = cbItem14.Checked;
+            //    item.Remark = values.Value<string>("Remark");
+            //    BLL.DriverPrepareDutyItemService.UpdateDutyItem(item);
+            //}
+
+
             ShowNotify("保存成功！", MessageBoxIcon.Success);
             PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
         }
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx.cs
index 3b71c7b6..c6f319a4 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx.cs
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
                 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;
+                int sortIndex = 200;
                 if (plan != null)
                 {
                     var items = BLL.DriverPrepareSchemePlanItemService.GetSchemePlanItemByschemePlanId(plan.SchemePlanId);
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemSelect.aspx b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemSelect.aspx
index 1895bcb4..f4853597 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemSelect.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemSelect.aspx
@@ -33,11 +33,27 @@
                                         </f:RadioButtonList>
                                     <f:ToolbarFill ID="ToolbarFill1" runat="server">
                                     </f:ToolbarFill>
+                                    <f:HiddenField runat="server" ID="hdNames"></f:HiddenField>
                                     <f:Button ID="btnAccept" Icon="Accept" runat="server" Text="确定" ToolTip="确定"
                                         OnClick="btnAccept_Click">
                                     </f:Button>
                                 </Items>
                             </f:Toolbar>
+                            <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
+                                <Items>              
+                                    <f:RadioButtonList ID="rblType2" runat="server" AutoPostBack="true" Width="520px"
+                                            OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
+                                            <f:RadioItem Value="公用工程" Text="公用工程" Selected="true" />
+                                            <f:RadioItem Value="空分" Text="空分" />
+                                            <f:RadioItem Value="气化" Text="气化" />
+                                            <f:RadioItem Value="净化" Text="净化" />
+                                            <f:RadioItem Value="合成" Text="合成" />
+                                            <f:RadioItem Value="尿素" Text="尿素" />
+                                        </f:RadioButtonList>
+                                    <f:ToolbarFill ID="ToolbarFill2" runat="server">
+                                    </f:ToolbarFill>
+                                </Items>
+                            </f:Toolbar>
                         </Toolbars>
                         <Columns>
                             <f:RenderField HeaderText="序号" ColumnID="SortIndex"
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemSelect.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemSelect.aspx.cs
index 1f4c3d03..1fb873c5 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemSelect.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemSelect.aspx.cs
@@ -27,6 +27,14 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
 
         protected void TextBox_TextChanged(object sender, EventArgs e)
         {
+            if (this.rblType.SelectedValue == "合成氨尿素项目")
+            {
+                this.Toolbar2.Hidden = false;
+            }
+            else
+            {
+                this.Toolbar2.Hidden = true;
+            }
             this.BindGrid();
         }
 
@@ -36,11 +44,26 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
         /// </summary>
         private void BindGrid()
         {
+            string[] selectRowId = Grid1.SelectedRowIDArray;
+            foreach (GridRow row in Grid1.Rows)
+            {
+                if (selectRowId.Contains(row.RowID))
+                {
+                    hdNames.Text += row.DataKeys[1].ToString() + ",";
+                }
+            }
             string strSql = @"SELECT * 
                                FROM dbo.DriverPrepare_SchemePlanItem 
                                WHERE SchemePlanId=@SchemePlanId";
             List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@SchemePlanId", this.rblType.SelectedValue));
+            if (this.rblType.SelectedValue == "合成氨尿素项目")
+            {
+                listStr.Add(new SqlParameter("@SchemePlanId", this.rblType2.SelectedValue));
+            }
+            else
+            {
+                listStr.Add(new SqlParameter("@SchemePlanId", this.rblType.SelectedValue));
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
@@ -109,7 +132,7 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
             string[] selectRowId = Grid1.SelectedRowIDArray;
             foreach (GridRow row in Grid1.Rows)
             {
-                if (selectRowId.Contains(row.RowID) && !nameLists.Contains(row.DataKeys[1].ToString()))
+                if (selectRowId.Contains(row.RowID) && !nameLists.Contains(row.DataKeys[1].ToString()) && !hdNames.Text.Contains(row.DataKeys[1].ToString()))
                 {
                     Model.DriverPrepare_SchemePlanItem newItem = new Model.DriverPrepare_SchemePlanItem();
                     newItem.SchemePlanItemId = SQLHelper.GetNewID();
@@ -119,6 +142,23 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
                     BLL.DriverPrepareSchemePlanItemService.AddSchemePlanItem(newItem);
                 }
             }
+            if (!string.IsNullOrEmpty(hdNames.Text))
+            {
+                string[] names = hdNames.Text.Split(',');
+                foreach (var item in names)
+                {
+                    if (!string.IsNullOrEmpty(item) && !nameLists.Contains(item))
+                    {
+                        Model.DriverPrepare_SchemePlanItem newItem = new Model.DriverPrepare_SchemePlanItem();
+                        newItem.SchemePlanItemId = SQLHelper.GetNewID();
+                        newItem.SchemePlanId = newData.SchemePlanId;
+                        newItem.SolutionName = item;
+                        Random ra = new Random();
+                        newItem.SortIndex = ra.Next(20, 200);
+                        BLL.DriverPrepareSchemePlanItemService.AddSchemePlanItem(newItem);
+                    }
+                }
+            }
             PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
         }
         #endregion
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemSelect.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemSelect.aspx.designer.cs
index cdda17c8..65407acd 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemSelect.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemSelect.aspx.designer.cs
@@ -84,6 +84,15 @@ namespace FineUIPro.Web.TestRun.DriverPrepare {
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
         
+        /// <summary>
+        /// hdNames 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdNames;
+        
         /// <summary>
         /// btnAccept 控件。
         /// </summary>
@@ -92,5 +101,32 @@ namespace FineUIPro.Web.TestRun.DriverPrepare {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAccept;
+        
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+        
+        /// <summary>
+        /// rblType2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblType2;
+        
+        /// <summary>
+        /// ToolbarFill2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill2;
     }
 }