diff --git a/DataBase/版本日志/SGGLDB_WH_2024-04-18-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-04-18-bwj.sql
new file mode 100644
index 00000000..778001ef
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-04-18-bwj.sql
@@ -0,0 +1,3 @@
+
+alter table Comprehensive_SpecialEquipment add PositionNum nvarchar(50)
+go
\ No newline at end of file
diff --git a/DataBase/版本日志/SGGLDB_WH_2024-04-22-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-04-22-bwj.sql
new file mode 100644
index 00000000..a715e653
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-04-22-bwj.sql
@@ -0,0 +1,7 @@
+
+alter table Comprehensive_InspectionPerson add RemarkCode nvarchar(50)
+alter table Comprehensive_InspectionMachine add RemarkCode nvarchar(50)
+alter table Comprehensive_DesignChangeOrder add RemarkCode nvarchar(50)
+alter table Comprehensive_NCRManagement add RemarkCode nvarchar(50)
+alter table Comprehensive_DataReceivingDoc add RemarkCode nvarchar(50)
+
diff --git a/DataBase/版本日志/SGGLDB_WH_2024-04-22-wq.sql b/DataBase/版本日志/SGGLDB_WH_2024-04-22-wq.sql
new file mode 100644
index 00000000..c10140e4
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-04-22-wq.sql
@@ -0,0 +1,75 @@
+
+delete Sys_Menu where MenuId='2590BA0B-3B56-4F8A-8EB8-2D047EF90753'
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('2590BA0B-3B56-4F8A-8EB8-2D047EF90753','������־����',null,'TestRun/ProduceTestRun/RunningLogManagementList.aspx',1,'110E8BDB-8121-4C5B-A3C3-AF2B34B1B29B','Menu_TestRun',0,1,1)
+
+--==������־����
+if object_id(N'Running_LogManagement',N'U') is not null
+drop table dbo.Running_LogManagement
+CREATE TABLE dbo.Running_LogManagement(
+	RunningId varchar(50) NOT NULL,--����
+	ProjectId varchar(50) NULL,--��Ŀ����
+	InstallationId varchar(50) NULL,--װ������
+	ProcessesId varchar(50) NULL,--��������
+	SystemId varchar(50) NULL,--ϵͳ����
+	JobNo varchar(50) NULL,--�ļ���
+	ShiftType varchar(50) NULL,--�ְ�����1:�װ�2:ҹ��
+	ShiftUser varchar(50) NULL,--�ְ�ְ��
+	SuccessionUser varchar(50) NULL,--����ְ��
+	StartData datetime NULL,--��ʼ����
+	EndData datetime NULL,--��������
+	Situation varchar(1000),--�������
+	Remarks varchar(1000),--��ע
+	HandoverCare varchar(1000),--����ע��
+	AddUser varchar(50) NULL,--������
+	AddTime datetime NULL,--��������
+	Sort int NULL,--����
+ CONSTRAINT PK_Running_LogManagement PRIMARY KEY CLUSTERED 
+(
+	RunningId 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
+
+--������־��������
+if object_id(N'Running_Operation',N'U') is not null
+drop table dbo.Running_Operation
+CREATE TABLE dbo.Running_Operation(
+	OperationId varchar(50) NOT NULL,--����
+	RunningId varchar(50) NULL,--������־����
+	ProjectId varchar(50) NULL,--��Ŀ����
+	InstallationId varchar(50) NULL,--װ������
+	ProcessesId varchar(50) NULL,--��������
+	SystemId varchar(50) NULL,--ϵͳ����
+	OperationReason varchar(1000),--��������ԭ��
+	OperationHandle varchar(1000),--�������⴦��
+	AddUser varchar(50) NULL,--������
+	AddTime datetime NULL,--��������
+	Sort int NULL,--����
+	 CONSTRAINT PK_Running_Operation PRIMARY KEY CLUSTERED 
+(
+	OperationId 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
+
+--������־ά������
+if object_id(N'Running_Maintenance',N'U') is not null
+drop table dbo.Running_Maintenance
+CREATE TABLE dbo.Running_Maintenance(
+	MaintenanceId varchar(50) NOT NULL,--����
+	RunningId varchar(50) NULL,--������־����
+	ProjectId varchar(50) NULL,--��Ŀ����
+	InstallationId varchar(50) NULL,--װ������
+	ProcessesId varchar(50) NULL,--��������
+	SystemId varchar(50) NULL,--ϵͳ����
+	MaintenanceReason varchar(1000),--ά������ԭ��
+	MaintenanceHandle varchar(1000),--ά�����⴦��
+	AddUser varchar(50) NULL,--������
+	AddTime datetime NULL,--��������
+	Sort int NULL,--����
+	 CONSTRAINT PK_Running_Maintenance PRIMARY KEY CLUSTERED 
+(
+	MaintenanceId 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
\ No newline at end of file
diff --git a/SGGL/BLL/CQMS/Check/JointCheckService.cs b/SGGL/BLL/CQMS/Check/JointCheckService.cs
index 7e6a43ec..bdd02f6d 100644
--- a/SGGL/BLL/CQMS/Check/JointCheckService.cs
+++ b/SGGL/BLL/CQMS/Check/JointCheckService.cs
@@ -518,5 +518,15 @@ namespace BLL
                 db.SubmitChanges();
             }
         }
+
+        /// <summary>
+        /// 根据项目Id获取专项检查
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static List<Model.Check_JointCheck> GetDriverPlanByProjectId(string projectId)
+        {
+            return (from x in Funs.DB.Check_JointCheck where x.ProjectId == projectId select x).ToList();
+        }
     }
 }
diff --git a/SGGL/BLL/CQMS/Comprehensive/DataReceivingDocService.cs b/SGGL/BLL/CQMS/Comprehensive/DataReceivingDocService.cs
index 9dac14b5..d199e432 100644
--- a/SGGL/BLL/CQMS/Comprehensive/DataReceivingDocService.cs
+++ b/SGGL/BLL/CQMS/Comprehensive/DataReceivingDocService.cs
@@ -65,6 +65,7 @@ namespace BLL
                 CompileDate = doc.CompileDate,
                 Status = doc.Status,
                 AuditMan = doc.AuditMan,
+                RemarkCode = doc.RemarkCode
             };
             Funs.DB.Comprehensive_DataReceivingDoc.InsertOnSubmit(newDoc);
             Funs.DB.SubmitChanges();
diff --git a/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs b/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs
index d53ea1f7..8003bf0f 100644
--- a/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs
+++ b/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs
@@ -197,6 +197,7 @@ namespace BLL
             newDesignChangeOrder.CompileDate = desginChangeOrder.CompileDate;
             newDesignChangeOrder.CompleteDate = desginChangeOrder.CompleteDate;
             newDesignChangeOrder.Status = desginChangeOrder.Status;
+            newDesignChangeOrder.RemarkCode = desginChangeOrder.RemarkCode;
             db.Comprehensive_DesignChangeOrder.InsertOnSubmit(newDesignChangeOrder);
             db.SubmitChanges();
         }
@@ -225,6 +226,7 @@ namespace BLL
                 newDesignChangeOrder.ImplementationFrontState = desginChangeOrder.ImplementationFrontState;
                 newDesignChangeOrder.CompleteDate = desginChangeOrder.CompleteDate;
                 newDesignChangeOrder.Status = desginChangeOrder.Status;
+                newDesignChangeOrder.RemarkCode = desginChangeOrder.RemarkCode;
                 db.SubmitChanges();
             }
         }
diff --git a/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs b/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs
index ca1d601b..7d002b8d 100644
--- a/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs
+++ b/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs
@@ -128,6 +128,7 @@ namespace BLL
             newInspectionMachine.UnitsCount = inspectionMachine.UnitsCount;
             newInspectionMachine.LeaveDate = inspectionMachine.LeaveDate;
             newInspectionMachine.Status = inspectionMachine.Status;
+            newInspectionMachine.RemarkCode = inspectionMachine.RemarkCode;
             db.Comprehensive_InspectionMachine.InsertOnSubmit(newInspectionMachine);
             db.SubmitChanges();
         }
@@ -159,6 +160,7 @@ namespace BLL
                 newInspectionMachine.UnitsCount = inspectionMachine.UnitsCount;
                 newInspectionMachine.LeaveDate = inspectionMachine.LeaveDate;
                 newInspectionMachine.Status = inspectionMachine.Status;
+                newInspectionMachine.RemarkCode = inspectionMachine.RemarkCode;
                 db.SubmitChanges();
             }
         }
diff --git a/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs b/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs
index 179687e2..c31f907b 100644
--- a/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs
+++ b/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs
@@ -61,6 +61,7 @@ namespace BLL
             newInspectionPerson.UnitWorkId = inspectionPerson.UnitWorkId;
             newInspectionPerson.Status = inspectionPerson.Status;
             newInspectionPerson.IsTrain = inspectionPerson.IsTrain;
+            newInspectionPerson.RemarkCode = inspectionPerson.RemarkCode;
             db.Comprehensive_InspectionPerson.InsertOnSubmit(newInspectionPerson);
             db.SubmitChanges();
         }
@@ -92,6 +93,7 @@ namespace BLL
                 newInspectionPerson.UnitWorkId = inspectionPerson.UnitWorkId;
                 newInspectionPerson.Status = inspectionPerson.Status;
                 newInspectionPerson.IsTrain = inspectionPerson.IsTrain;
+                newInspectionPerson.RemarkCode = inspectionPerson.RemarkCode;
                 db.SubmitChanges();
             }
         }
diff --git a/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs b/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs
index ea7fe758..1e5b5755 100644
--- a/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs
+++ b/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs
@@ -118,6 +118,7 @@ namespace BLL
             newNCRManagement.Status = nCRManagement.Status;
             newNCRManagement.Problem = nCRManagement.Problem;
             newNCRManagement.Measure = nCRManagement.Measure;
+            newNCRManagement.RemarkCode = nCRManagement.RemarkCode;
             db.Comprehensive_NCRManagement.InsertOnSubmit(newNCRManagement);
             db.SubmitChanges();
         }
diff --git a/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs b/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs
index 6d0f4537..a3f7f589 100644
--- a/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs
+++ b/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs
@@ -105,6 +105,7 @@ namespace BLL
             newEquipment.MonitoringReportNumber = SpecialEquipment.MonitoringReportNumber;
             newEquipment.CompileMan = SpecialEquipment.CompileMan;
             newEquipment.Status = SpecialEquipment.Status;
+            newEquipment.PositionNum = SpecialEquipment.PositionNum;
             db.Comprehensive_SpecialEquipment.InsertOnSubmit(newEquipment);
             db.SubmitChanges();
         }
@@ -127,6 +128,7 @@ namespace BLL
                 newEquipment.SubmitDataNumber = SpecialEquipment.SubmitDataNumber;
                 newEquipment.MonitoringReportNumber = SpecialEquipment.MonitoringReportNumber;
                 newEquipment.Status = SpecialEquipment.Status;
+                newEquipment.PositionNum = SpecialEquipment.PositionNum;
                 db.SubmitChanges();
             }
         }
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index ff6456f1..69a4d707 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -3244,12 +3244,17 @@ namespace BLL
         /// <summary>
         /// 资料收发文登记记录导入模板原始虚拟路径
         /// </summary>
-        public const string CQMS_DataReceivingDocTempUrl = "File\\Excel\\DataIn\\资料收发文登记记录导入模板.xlsx";
+        public const string CQMS_DataReceivingDocTempUrl = "File\\Excel\\DataIn\\资料收发文登记记录导入模板.xls";
 
         /// <summary>
         /// 培训记录导入模板原始虚拟路径
         /// </summary>
         public const string CQMS_TrainingRecordsTemplateUrl= "File\\Excel\\DataIn\\培训记录导入模板.xlsx";
+
+        /// <summary>
+        /// 质量专项检查模板文件原始虚拟路径
+        /// </summary>
+        public const string JointCheckTempUrl = "File\\Excel\\CQMS\\质量专项检查模版.xlsx";
         #endregion
 
         #region 绩效考核模板文件路径
diff --git a/SGGL/BLL/ProjectData/UnitWorkService.cs b/SGGL/BLL/ProjectData/UnitWorkService.cs
index e3ef0752..16e48681 100644
--- a/SGGL/BLL/ProjectData/UnitWorkService.cs
+++ b/SGGL/BLL/ProjectData/UnitWorkService.cs
@@ -590,5 +590,24 @@ namespace BLL
             }
             return name;
         }
+
+        public static string GetUnitWorkIdsByUnitWorkNames(string projectId,string unitWorks)
+        {
+            if (!string.IsNullOrEmpty(unitWorks))
+            {
+                string[] ins = unitWorks.Split(',');
+                string unitIds = string.Empty;
+                foreach (string s in ins)
+                {
+                    var q = GetUnitWorkByUnitWorkName(projectId, s.Trim()).UnitWorkId;
+                    unitIds += q + ",";
+                }
+                return unitIds.Substring(0, unitIds.LastIndexOf(','));
+            }
+            else
+            {
+                return string.Empty;
+            }
+        }
     }
 }
diff --git a/SGGL/BLL/SysManage/UnitService.cs b/SGGL/BLL/SysManage/UnitService.cs
index 4e193bbb..136f269c 100644
--- a/SGGL/BLL/SysManage/UnitService.cs
+++ b/SGGL/BLL/SysManage/UnitService.cs
@@ -671,10 +671,10 @@ namespace BLL
                 string unitIds = string.Empty;
                 foreach (string s in ins)
                 {
-                    var q = BLL.UnitService.getUnitByUnitName(s);
-                    unitIds = unitIds + q.UnitId + ",";
+                    var q = getUnitByUnitName(s.Trim());
+                    unitIds += q.UnitId + ",";
                 }
-                return unitIds.Substring(0, unitIds.Length - 1);
+                return unitIds.Substring(0, unitIds.LastIndexOf(","));
             }
             else
             {
diff --git a/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx
index 765c8c30..7a597f11 100644
--- a/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx
@@ -75,6 +75,9 @@
                                 <f:Button ID="btnNew" ToolTip="新增" Icon="Add"  EnablePostBack="false" runat="server"
                                     Hidden="true">
                                 </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
 
                             </Items>
                         </f:Toolbar>
diff --git a/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs
index 6e3bb4a7..34e2e611 100644
--- a/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.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;
 using System.Web;
 using System.Web.UI;
@@ -401,5 +402,188 @@ namespace FineUIPro.Web.CQMS.Check
             txtEndTime.Text = "";
             bindata();
         }
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            string rootPath = Server.MapPath("~/");
+            string initTemplatePath = Const.JointCheckTempUrl;
+            string uploadfilepath = string.Empty;
+            string newUrl = string.Empty;
+            uploadfilepath = rootPath + initTemplatePath;
+            var lists = BLL.JointCheckService.GetDriverPlanByProjectId(this.CurrUser.LoginProjectId);
+            if (lists != null)
+            {
+                newUrl = uploadfilepath.Replace("质量专项检查模版.xlsx", "质量专项检查.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;
+                int i = 1;
+                foreach (var item in lists)
+                {
+                    // 第二步：创建新数据行
+                    row = sheet.CreateRow(i);
+                    // 添加数据
+                    cell = row.CreateCell(0);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(i.ToString());//序号
+                    cell = row.CreateCell(1);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(item.JointCheckCode);
+                    cell = row.CreateCell(2);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(BLL.UnitService.GetUnitNameByUnitId(item.UnitId));
+                    cell = row.CreateCell(3);
+                    cell.CellStyle = cellStyle;
+                    string checkName = string.Empty;
+                    if (item.CheckType == "1")
+                    {
+                        checkName = "周检查";
+                    }
+                    else if (item.CheckType == "2")
+                    {
+                        checkName = "月检查";
+                    }
+                    else if (item.CheckType == "3")
+                    {
+                        checkName = "不定期检查";
+                    }
+                    else if (item.CheckType == "4")
+                    {
+                        checkName = "专业检查";
+                    }
+                    cell.SetCellValue(checkName);
+                    cell = row.CreateCell(4);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(item.CheckName);
+                    cell = row.CreateCell(5);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(item.CheckDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.CheckDate) : "");
+                    cell = row.CreateCell(6);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(BLL.UserService.GetUserNameByUserId(item.CheckMan));
+                    cell = row.CreateCell(7);
+                    cell.CellStyle = cellStyle;
+                    string state = string.Empty;
+                    if (item.State.ToString() == BLL.Const.JointCheck_ReCompile)
+                    {
+                        state = "重新编制";
+                    }
+                    else if (item.State.ToString() == BLL.Const.JointCheck_Compile)
+                    {
+                        state = "编制";
+                    }
+                    else if (item.State.ToString() == BLL.Const.JointCheck_Audit1)
+                    {
+                        state = "分包专工回复";
+                    }
+                    else if (item.State.ToString() == BLL.Const.JointCheck_Audit2)
+                    {
+                        state = "分包负责人审批";
+                    }
+                    else if (item.State.ToString() == BLL.Const.JointCheck_Audit3)
+                    {
+                        state = "总包专工回复";
+                    }
+                    else if (item.State.ToString() == BLL.Const.JointCheck_Audit4)
+                    {
+                        state = "总包负责人审批";
+                    }
+                    else if (item.State.ToString() == BLL.Const.JointCheck_Complete)
+                    {
+                        state = "审批完成";
+                    }
+                    else if (item.State.ToString() == BLL.Const.JointCheck_Z)
+                    {
+                        state = "整改中";
+                    }
+                    else if (item.State.ToString() == BLL.Const.JointCheck_Audit1R)
+                    {
+                        state = "分包专工重新回复";
+                    }
+                    cell.SetCellValue(state);
+                    cell = row.CreateCell(8);
+                    cell.CellStyle = cellStyle;
+                    string userNames = string.Empty;
+                    List<Model.Check_JointCheckApprove> list = BLL.JointCheckApproveService.GetJointCheckApprovesByJointCheckId(item.JointCheckId);
+                    foreach (var a in list)
+                    {
+                        if (a != null)
+                        {
+                            if (a.ApproveMan != null)
+                            {
+                                if (!userNames.Contains(BLL.UserService.GetUserByUserId(a.ApproveMan).UserName))
+                                {
+                                    userNames += UserService.GetUserByUserId(a.ApproveMan).UserName + ",";
+                                }
+                            }
+                        }
+                    }
+                    if (!string.IsNullOrEmpty(userNames))
+                    {
+                        userNames = userNames.Substring(0, userNames.LastIndexOf(","));
+                    }
+                    cell.SetCellValue(userNames);
+
+                    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/CQMS/Check/JointCheck.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.designer.cs
index 5ca52c9c..8f7cbdb0 100644
--- a/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.designer.cs
@@ -129,6 +129,15 @@ namespace FineUIPro.Web.CQMS.Check {
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
         
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+        
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx
index 02d5d8a7..0a2e1e10 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx
@@ -156,7 +156,7 @@
         </f:Window>
         <f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
-            Width="1024px" Height="560px">
+            Width="700px" Height="560px">
         </f:Window>
         <%--<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
             EnableMaximize="true" Target="Parent" EnableResize="false" runat="server"
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx
index d8c41fa8..b3cd36d4 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx
@@ -6,200 +6,63 @@
 <head runat="server">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>导入资料收发文登记记录</title>
-
-    <style type="text/css">
-        .f-grid-row.red {
-            background-color: LightCoral;
-        }
-
-        .Label {
-            font-size: larger;
-            font-weight: bold;
-        }
-    </style>
-    <style type="text/css">
-        /*定义父容器*/
-        .content {
-            width: 550px;
-            height: 30px;
-            background: #E4F1FB;
-            margin: 0 auto;
-        }
-        /*定义进度条*/
-        .box {
-            width: 0px;
-            height: 30px;
-            line-height: 30px;
-            text-align: center;
-            background: #3BAAE3;
-            color: #fff;
-        }
-    </style>
 </head>
 <body>
     <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:HiddenField ID="id" ClientIDMode="Static" runat="server"></f:HiddenField>
-        <f:Panel ID="Panel1" runat="server" Margin="2px" BodyPadding="2px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" OnCustomEvent="PageManager1_CustomEvent" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
             <Toolbars>
-                <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
+                <f:Toolbar ID="Toolbar2" Position="Top" ToolbarAlign="Right" runat="server">
                     <Items>
-                        <f:HiddenField ID="hdfileName" runat="server"></f:HiddenField>
-                        <f:FileUpload ID="FileExcel" runat="server" Label="数据文件" EmptyText="请上传EXCEl格式文件" Width="350px" LabelWidth="90px" LabelAlign="Right"></f:FileUpload>
-                        <f:Button ID="imgbtnImport" runat="server" Text="上传" ToolTip="文件上传" OnClick="imgbtnImport_Click"></f:Button>
-                        <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
-                        <f:CheckBox ID="ckUpdate" runat="server" Text="更新导入"></f:CheckBox>
-                        <f:Button ID="btnSave" runat="server" Text="保存" ToolTip="审核保存" Icon="SystemSave" OnClick="btnSave_Click"></f:Button>
-                        <f:Button ID="btnRefresh" runat="server" ClientIDMode="Static" Text="刷新" Icon="SystemSave" OnClick="btnRefresh_Click" Hidden="true"></f:Button>
-
-                        <f:Button ID="btnAllDelete" runat="server" Icon="Delete" Text="删除记录" ToolTip="删除当前人所有临时导入记录" ConfirmText="删除当前人所有临时导入记录？"
-                            ConfirmTarget="Top" OnClick="btnAllDelete_Click">
+                        <f:HiddenField ID="hdFileName" runat="server">
+                        </f:HiddenField>
+                        <f:Button ID="btnAudit" Icon="ApplicationEdit" runat="server" ToolTip="审核" ValidateForms="SimpleForm1"
+                            OnClick="btnAudit_Click">
                         </f:Button>
-                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="TableGo"
-                            EnableAjax="false" DisableControlBeforePostBack="false">
+                        <f:Button ID="btnImport" Icon="ApplicationGet" runat="server" ToolTip="导入" ValidateForms="SimpleForm1"
+                            OnClick="btnImport_Click">
                         </f:Button>
-                        <f:Button ID="imgbtnUpload" runat="server" Icon="DiskDownload" Text="模板下载" OnClick="imgbtnUpload_Click" EnableAjaxLoading="false"></f:Button>
-                        <%--<f:Button ID="lkAchievements" runat="server" Icon="DiskDownload" Text="导入说明" OnClick="lkAchievements_Click" EnableAjaxLoading="false"></f:Button>--%>
-                    </Items>
-                    <Items>
+                        <f:Button ID="btnDownLoad" runat="server" Icon="ApplicationGo" ToolTip="下载模板" OnClick="btnDownLoad_Click">
+                        </f:Button>
+                        <f:HiddenField ID="hdCheckResult" runat="server">
+                        </f:HiddenField>
                     </Items>
                 </f:Toolbar>
             </Toolbars>
-            <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据导入" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="TempId" AllowCellEditing="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableColumnLines="true" ClicksToEdit="2" DataIDField="TempId" AllowSorting="true"
-                    SortField="RowNo" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                    <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
-                            EnableLock="true" Locked="False">
-                            <ItemTemplate>
-                                <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="70px" HeaderText="行号" ColumnID="RowNo" DataField="RowNo" SortField="RowNo"
-                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Value1" DataField="Value1" FieldType="String" HeaderText="日期" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="100px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Value2" DataField="Value2" FieldType="String" HeaderText="文件号" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Value3" DataField="Value3" FieldType="String" HeaderText="文件名称" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Value4" DataField="Value4" FieldType="String" HeaderText="文件类别" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="100px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Value5" DataField="Value5" FieldType="String" HeaderText="专业" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="100px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Value6" DataField="Value6" FieldType="String" HeaderText="发件单位" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="100px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Value7" DataField="Value7" FieldType="String" HeaderText="发件人" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="100px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Value8" DataField="Value8" FieldType="String" HeaderText="份数" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="100px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Value9" DataField="Value9" FieldType="String" HeaderText="文件处理人" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="100px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Value10" DataField="Value10" FieldType="String" HeaderText="发出日期" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="100px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Value11" DataField="Value11" FieldType="String" HeaderText="接收单位" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="100px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Value12" DataField="Value12" FieldType="String" HeaderText="接收人" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="100px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Value13" DataField="Value13" FieldType="String" HeaderText="是否需回复" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="100px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Value14" DataField="Value14" FieldType="String" HeaderText="返回五环日期" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="100px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Value15" DataField="Value15" FieldType="String" HeaderText="返回五环份数" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Value16" DataField="Value16" FieldType="String" HeaderText="下发至单位" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Value17" DataField="Value17" FieldType="String" HeaderText="下发份数" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="100px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Value18" DataField="Value18" FieldType="String" HeaderText="下发单位接收人" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Value19" DataField="Value19" FieldType="String" HeaderText="是否存档" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="100px">
-                        </f:RenderField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                            <f:ListItem Text="10" Value="10" />
-                            <f:ListItem Text="15" Value="15" Selected="true" />
-                            <f:ListItem Text="20" Value="20" />
-                            <f:ListItem Text="25" Value="25" />
-                        </f:DropDownList>
-                        <f:Label Label="错误记录数" runat="server" ID="lbDataCout" CssClass="Label" LabelAlign="right" LabelWidth="120px"></f:Label>
-                    </PageItems>
-                </f:Grid>
-            </Items>
-        </f:Panel>
-        <f:Window ID="Window1" Title="数据信息" Hidden="true" EnableIFrame="true"
-            EnableMaximize="true" Target="Top" EnableResize="true" runat="server"
-            IsModal="true" Width="1200px" Height="600px">
-        </f:Window>
-        <f:Window ID="Window2" Hidden="true" runat="server" MinHeight="30px"
-            Target="Parent" ShowHeader="false" BodyPadding="0" Margin="0"
-            IsModal="true" Width="550px" Height="32px">
-            <Items>
-                <f:ContentPanel ShowBorder="false" Height="30px" ShowHeader="false" ID="ContentPanel3" runat="server">
-                    <div class="content" id="content">
-                        <div class="box" id="box"></div>
-                    </div>
-                </f:ContentPanel>
-            </Items>
-        </f:Window>
-        <f:Menu ID="Menu1" ClientIDMode="Static" runat="server">
-            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
-                runat="server" Text="编辑" Icon="TableEdit">
-            </f:MenuButton>
-            <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
-                ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server" Text="删除" Icon="Delete">
-            </f:MenuButton>
-        </f:Menu>
-        <asp:ScriptManager ID="ScriptManager2" runat="server" EnablePageMethods="true">
-            <Scripts>
-                <asp:ScriptReference Path="~/res/DataInTable.js" />
-            </Scripts>
-        </asp:ScriptManager>
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:FileUpload runat="server" ID="fuAttachUrl" EmptyText="选择要导入的文件" Label="选择要导入的文件"
+                            LabelWidth="150px">
+                        </f:FileUpload>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Grid ID="gvErrorInfo" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="资料收发文登记记录" EnableCollapse="true"
+                            runat="server" BoxFlex="1" AllowCellEditing="true" ClicksToEdit="2" AllowSorting="true"
+                            SortDirection="DESC" EnableColumnLines="true" ForceFit="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10"
+                            EnableRowDoubleClickEvent="true" AllowFilters="true" EnableTextSelection="True">
+                            <Columns>
+                                <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblPageIndex" runat="server" Text='<%# gvErrorInfo.PageIndex * gvErrorInfo.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:BoundField DataField="Row" HeaderText="错误行号">
+                                </f:BoundField>
+                                <f:BoundField DataField="Column" HeaderText="错误列">
+                                </f:BoundField>
+                                <f:BoundField DataField="Reason" HeaderText="错误类型">
+                                </f:BoundField>
+                            </Columns>
+                        </f:Grid>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+        </f:Form>
     </form>
-    <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');
-        }
-    </script>
 </body>
 </html>
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx.cs
index dc38a99d..bf26116c 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx.cs
@@ -3,6 +3,7 @@ using Model;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Data.OleDb;
 using System.Data.SqlClient;
 using System.IO;
 using System.Linq;
@@ -12,7 +13,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 {
     public partial class DataReceivingDocDataIn : PageBase
     {
-        #region 定义项
+        #region 定义变量
         /// <summary>
         /// 上传预设的虚拟路径
         /// </summary>
@@ -21,8 +22,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// <summary>
         /// 错误集合
         /// </summary>
-        public static string errorInfos = string.Empty;
-
+        public static List<Model.ErrorInfo> errorInfos = new List<Model.ErrorInfo>();
         #endregion
 
         #region 加载
@@ -35,660 +35,585 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         {
             if (!IsPostBack)
             {
-                if (percent == null)
+                this.hdCheckResult.Text = string.Empty;
+                this.hdFileName.Text = string.Empty;
+                if (errorInfos != null)
                 {
-                    percent = new Dictionary<string, int>();
-                }
-                this.id.Text = this.CurrUser.UserId;
-                this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                // 绑定表格
-                this.BindGrid();
-            }
-            else if (GetRequestEventArgument() == "reloadGrid")
-            {
-                BindGrid();
-            }
-        }
-        #endregion
-
-        #region 绑定数据
-        /// <summary>
-        /// 绑定数据
-        /// </summary>
-        private void BindGrid()
-        {
-            string strSql = @"SELECT TempId,ProjectId,UserId,Time,RowNo,ToopValue,Value1,Value2,Value3,Value4,Value5,Value6,Value7,Value8,Value9,Value10"
-                + @" ,Value11,Value12,Value13,Value14,Value15,Value16,Value17,Value18,Value19,Value20,Value21,Value22,Value23,Value24,Value25,Value26,Value27,Value28,Value29,Value30"
-                + @" ,Value31,Value32,Value33,Value34,Value35,Value36,Value37,Value38,Value39,Value40,Value41,Value42,Value43,Value44,Value45,Value46,Value47,Value48,Value49,Value50,ToopValue,Type"
-                + @" FROM Sys_DataInTemp  "
-                + @" WHERE ProjectId=@ProjectId AND UserId=@UserId AND Type=@Type";
-            List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
-            listStr.Add(new SqlParameter("@UserId", this.CurrUser.UserId));
-            listStr.Add(new SqlParameter("@Type", "DataReceivingDoc"));//资料收发文登记记录
-            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();
-
-            var dataInTempAll = from x in Funs.DB.Sys_DataInTemp
-                                where x.ProjectId == this.CurrUser.LoginProjectId && x.UserId == this.CurrUser.UserId && x.Type == "DataReceivingDoc"
-                                select x;
-            for (int i = 0; i < Grid1.Rows.Count; i++)
-            {
-                var dataInTemp = dataInTempAll.FirstOrDefault(x => x.TempId == Grid1.Rows[i].DataKeys[0].ToString());
-                if (dataInTemp != null)
-                {
-                    if (!string.IsNullOrEmpty(dataInTemp.ToopValue))
-                    {
-                        Grid1.Rows[i].RowCssClass = "red";
-                    }
+                    errorInfos.Clear();
                 }
             }
-            var errData = from x in dataInTempAll where x.ToopValue != null select x;
-            this.lbDataCout.Text = errData.Count().ToString();
         }
         #endregion
 
-        #region 双击事件
+        #region 审核
         /// <summary>
-        /// Grid行双击事件
+        /// 审核
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
-        {
-            if (Grid1.SelectedRowIndexArray.Length == 0)
-            {
-                Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
-                return;
-            }
-            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.DataReceivingDocMenuId, Const.BtnSave))
-            {
-                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DataReceivingDocDataInEdit.aspx?TempId={0}", Grid1.SelectedRowID, "维护 - ")));
-            }
-            else
-            {
-                ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
-            }
-        }
-        #endregion
-
-        #region 导入信息 维护
-        /// <summary>
-        /// 导入信息编辑
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnMenuEdit_Click(object sender, EventArgs e)
-        {
-            if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.DataReceivingDocMenuId, BLL.Const.BtnSave))
-            {
-                if (Grid1.SelectedRowIndexArray.Length == 0)
-                {
-                    Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
-                    return;
-                }
-                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DataReceivingDocDataInEdit.aspx?TempId={0}", Grid1.SelectedRowID, "维护 - ")));
-            }
-            else
-            {
-                ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
-            }
-        }
-
-        /// <summary>
-        /// 删除按钮
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnMenuDelete_Click(object sender, EventArgs e)
-        {
-            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.DataReceivingDocMenuId, Const.BtnSave))
-            {
-                if (Grid1.SelectedRowIndexArray.Length == 0)
-                {
-                    Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
-                    return;
-                }
-                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
-                {
-                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
-                    BLL.Sys_DataTempService.DeleteDataInTempByDataInTempID(rowID);
-                }
-                ShowNotify("删除成功！", MessageBoxIcon.Success);
-                this.BindGrid();
-            }
-            else
-            {
-                Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
-                return;
-            }
-        }
-        #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)
-        {
-            BindGrid();
-        }
-        #endregion     
-
-        #region 删除所有数据事件
-        /// <summary>
-        /// 删除所有数据事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnAllDelete_Click(object sender, EventArgs e)
-        {
-            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.DataReceivingDocMenuId, Const.BtnSave))
-            {
-                //先删除临时表中 该人员以前导入的数据
-                BLL.Sys_DataTempService.DeleteDataInTempByProjectIdUserId(this.CurrUser.LoginProjectId, this.CurrUser.UserId, "DataReceivingDoc");
-                this.BindGrid();
-                ShowNotify("删除成功！", MessageBoxIcon.Success);
-                this.lbDataCout.Text = string.Empty;
-            }
-            else
-            {
-                Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
-                return;
-            }
-        }
-        #endregion
-
-        #region 下载模板
-        /// <summary>
-        /// 下载模板
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void imgbtnUpload_Click(object sender, EventArgs e)
-        {
-            this.TemplateUpload(BLL.Const.CQMS_DataReceivingDocTempUrl);
-        }
-
-        protected void TemplateUpload(string initTemplatePath)
-        {
-            string rootPath = Server.MapPath("~/");
-            string uploadfilepath = rootPath + initTemplatePath;
-            string filePath = Const.CQMS_DataReceivingDocTempUrl;
-            string fileName = Path.GetFileName(filePath);
-            FileInfo info = new FileInfo(uploadfilepath);
-            long fileSize = info.Length;
-            Response.ClearContent();
-            Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
-            Response.ContentType = "excel/plain";
-            Response.ContentEncoding = System.Text.Encoding.UTF8;
-            Response.AddHeader("Content-Length", fileSize.ToString().Trim());
-            Response.TransmitFile(uploadfilepath, 0, fileSize);
-            Response.End();
-        }
-
-        /// <summary>
-        /// 导入说明
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        //protected void lkAchievements_Click(object sender, EventArgs e)
-        //{
-        //    this.TemplateUpload(Const.CQMS_DataReceivingDocTempUrl);
-        //}
-        #endregion
-
-        #region 进度条
-        public static Dictionary<string, int> percent { get; set; }
-        public static Dictionary<string, string> url { get; set; }
-
-        [System.Web.Services.WebMethod]
-        public static int getPercent(string id)
-        {
-            return percent[id];
-        }
-        #endregion
-
-        #region 文件上传
-        /// <summary>
-        /// 文件上传
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void imgbtnImport_Click(object sender, EventArgs e)
+        protected void btnAudit_Click(object sender, EventArgs e)
         {
             try
             {
-                if (this.FileExcel.HasFile == false)
+                if (this.fuAttachUrl.HasFile == false)
                 {
-                    ShowNotify("请选择Excel文件!", MessageBoxIcon.Warning);
+                    ShowNotify("请您选择Excel文件！", MessageBoxIcon.Warning);
                     return;
                 }
-                string IsXls = Path.GetExtension(this.FileExcel.FileName).ToString().Trim().ToLower();
-                if (IsXls != ".xls" && IsXls != ".xlsx")
+                string IsXls = Path.GetExtension(this.fuAttachUrl.FileName).ToString().Trim().ToLower();
+                if (IsXls != ".xls")
                 {
-                    ShowNotify("只能选择Excel文件!", MessageBoxIcon.Warning);
+                    ShowNotify("只可以选择Excel文件！", MessageBoxIcon.Warning);
                     return;
                 }
+                if (errorInfos != null)
+                {
+                    errorInfos.Clear();
+                }
                 string rootPath = Server.MapPath("~/");
                 string initFullPath = rootPath + initPath;
                 if (!Directory.Exists(initFullPath))
                 {
                     Directory.CreateDirectory(initFullPath);
                 }
-                //指定上传文件名称
-                this.hdfileName.Text = BLL.Funs.GetNewFileName() + IsXls;
-                //上传文件路径
-                string filePath = initFullPath + this.hdfileName.Text;
-                //文件上传服务器
-                this.FileExcel.PostedFile.SaveAs(filePath);
-                //文件上传服务器后的名称
-                string fileName = rootPath + initPath + this.hdfileName.Text;
-                //读取Excel
-                DataSet ds = NPOIHelper.ExcelToDataSet(fileName, out errorInfos, true);
-                //验证Excel读取是否有误
-                if (!string.IsNullOrEmpty(errorInfos))
-                {
-                    ShowNotify(errorInfos, MessageBoxIcon.Warning);
-                    return;
-                }
 
-                if (ds.Tables.Count > 0)
-                {
-                    for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
-                    {
-                        Sys_DataInTemp newDataInTemp = new Sys_DataInTemp();
-                        newDataInTemp.TempId = SQLHelper.GetNewID(typeof(Model.Sys_DataInTemp));
-                        newDataInTemp.ProjectId = this.CurrUser.LoginProjectId;
-                        newDataInTemp.UserId = this.CurrUser.UserId;
-                        newDataInTemp.Time = System.DateTime.Now;
-                        newDataInTemp.Type = "DataReceivingDoc";
-                        newDataInTemp.RowNo = i + 2;
-                        newDataInTemp.Value1 = ds.Tables[0].Rows[i]["日期"].ToString().Trim();
-                        newDataInTemp.Value2 = ds.Tables[0].Rows[i]["文件号"].ToString().Trim();
-                        newDataInTemp.Value3 = ds.Tables[0].Rows[i]["文件名称"].ToString().Trim();
-                        newDataInTemp.Value4 = ds.Tables[0].Rows[i]["文件类别"].ToString().Trim();
-                        newDataInTemp.Value5 = ds.Tables[0].Rows[i]["专业"].ToString().Trim();
-                        newDataInTemp.Value6 = ds.Tables[0].Rows[i]["发件单位"].ToString().Trim();
-                        newDataInTemp.Value7 = ds.Tables[0].Rows[i]["发件人"].ToString().Trim();
-                        newDataInTemp.Value8 = ds.Tables[0].Rows[i]["份数"].ToString().Trim();
-                        newDataInTemp.Value9 = ds.Tables[0].Rows[i]["文件处理人"].ToString().Trim();
-                        newDataInTemp.Value10 = ds.Tables[0].Rows[i]["发出日期"].ToString().Trim();
-                        newDataInTemp.Value11 = ds.Tables[0].Rows[i]["接收单位"].ToString().Trim();
-                        newDataInTemp.Value12 = ds.Tables[0].Rows[i]["接收人"].ToString().Trim();
-                        newDataInTemp.Value13 = ds.Tables[0].Rows[i]["是否需回复"].ToString().Trim();
-                        newDataInTemp.Value14 = ds.Tables[0].Rows[i]["返回五环日期"].ToString().Trim();
-                        newDataInTemp.Value15 = ds.Tables[0].Rows[i]["返回五环份数"].ToString().Trim();
-                        newDataInTemp.Value16 = ds.Tables[0].Rows[i]["下发至单位"].ToString().Trim();
-                        newDataInTemp.Value17 = ds.Tables[0].Rows[i]["下发份数"].ToString().Trim();
-                        newDataInTemp.Value18 = ds.Tables[0].Rows[i]["下发单位接收人"].ToString().Trim();
-                        newDataInTemp.Value19 = ds.Tables[0].Rows[i]["是否存档"].ToString().Trim();
-
-                        BLL.Sys_DataTempService.AddDataInTemp(newDataInTemp);
-                    }
-                    this.BindGrid();
-                    ShowNotify("数据已导入临时表！", MessageBoxIcon.Success);
-                }
-                else
-                {
-                    ShowNotify("无数据!", MessageBoxIcon.Warning);
-                    return;
-                }
+                this.hdFileName.Text = BLL.Funs.GetNewFileName() + IsXls;
+                string filePath = initFullPath + this.hdFileName.Text;
+                this.fuAttachUrl.PostedFile.SaveAs(filePath);
+                ImportXlsToData(rootPath + initPath + this.hdFileName.Text);
             }
             catch (Exception ex)
             {
-                Alert.ShowInTop("'" + ex.Message + "'", MessageBoxIcon.Warning);
+                ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning);
+            }
+        }
+
+        #region 读Excel提取数据
+        /// <summary>
+        /// 从Excel提取数据--》Dataset
+        /// </summary>
+        /// <param name="filename">Excel文件路径名</param>
+        private void ImportXlsToData(string fileName)
+        {
+            try
+            {
+                string oleDBConnString = String.Empty;
+                oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
+                oleDBConnString += "Data Source=";
+                oleDBConnString += fileName;
+                oleDBConnString += ";Extended Properties=Excel 8.0;";
+                OleDbConnection oleDBConn = null;
+                OleDbDataAdapter oleAdMaster = null;
+                DataTable m_tableName = new DataTable();
+                DataSet ds = new DataSet();
+
+                oleDBConn = new OleDbConnection(oleDBConnString);
+                oleDBConn.Open();
+                m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null);
+
+                if (m_tableName != null && m_tableName.Rows.Count > 0)
+                {
+
+                    m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim();
+
+                }
+                string sqlMaster;
+                sqlMaster = " SELECT *  FROM [" + m_tableName.TableName + "]";
+                oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn);
+                oleAdMaster.Fill(ds, "m_tableName");
+                oleAdMaster.Dispose();
+                oleDBConn.Close();
+                oleDBConn.Dispose();
+
+                AddDatasetToSQL(ds.Tables[0], 20);
+                hdCheckResult.Text = "1";
+            }
+            catch (Exception exc)
+            {
+                Response.Write(exc);
+                //return null;
+                // return dt;
+            }
+            finally
+            {
             }
         }
         #endregion
 
-        #region 保存审核事件
+        #region 将Dataset的数据导入数据库
         /// <summary>
-        /// 保存审核事件
+        /// 将Dataset的数据导入数据库
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnSave_Click(object sender, EventArgs e)
+        /// <param name="pds">数据集</param>
+        /// <param name="Cols">数据集行数</param>
+        /// <returns></returns>
+        private bool AddDatasetToSQL(DataTable pds, int Cols)
         {
-            Thread t = new Thread(new ThreadStart(() => { btnSaveMethod(this.CurrUser.LoginProjectId, this.CurrUser.UserId); }));
-            t.Start();
-            if (percent.ContainsKey(this.CurrUser.UserId))
+            string result = string.Empty;
+            int ic, ir;
+            ic = pds.Columns.Count;
+            if (ic < Cols)
             {
-                percent[CurrUser.UserId] = 0;
+                ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
+                return false;
             }
-            else
-            {
-                percent.Add(CurrUser.UserId, 0);
-            }
-            PageContext.RegisterStartupScript("printX()");
-        }
-        protected void btnRefresh_Click(object sender, EventArgs e)
-        {
-            this.BindGrid();
-        }
 
-        protected void btnSaveMethod(string LoginProjectId, string UserId)
-        {
-            var units = from x in Funs.DB.Base_Unit
-                        join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId
-                        where y.ProjectId == LoginProjectId
-                        select x;
-            var cNProfessionals = from x in Funs.DB.Base_CNProfessional select x;//专业
-
-            var dataInTemp = from x in Funs.DB.Sys_DataInTemp
-                             where x.ProjectId == LoginProjectId && x.UserId == UserId && x.Type == "DataReceivingDoc"
-                             select x;
-            int okCount = 0;
-            int i = 0;
-            int ir = dataInTemp.Count();
-            string erreMessage = "";
-            foreach (var tempData in dataInTemp)
+            ir = pds.Rows.Count;
+            if (pds != null && ir > 0)
             {
-                if (tempData != null)
+                var oldViewInfos = from x in Funs.DB.Comprehensive_DataReceivingDoc
+                                   where x.ProjectId == this.CurrUser.LoginProjectId
+                                   select x;
+
+                var units = from x in Funs.DB.Base_Unit
+                            join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId
+                            where y.ProjectId == this.CurrUser.LoginProjectId
+                            select x;
+
+                var cns = from x in Funs.DB.Base_CNProfessional select x;               
+
+                for (int i = 0; i < ir; i++)
                 {
-                    i++;
-                    percent[UserId] = (int)(100 * i / ir);
-                    string errInfo = string.Empty;
-                    var isExitValue = Funs.DB.Comprehensive_DataReceivingDoc.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.FileCode == tempData.Value2
-                        && x.FileName == tempData.Value3);
-                    if (isExitValue == null || this.ckUpdate.Checked)
+                    string row0 = pds.Rows[i][0].ToString();
+                    if (string.IsNullOrEmpty(row0))
                     {
-                        Model.Comprehensive_DataReceivingDoc newData = new Model.Comprehensive_DataReceivingDoc();
-                        if (!string.IsNullOrEmpty(tempData.Value1.Trim()))
-                        {
-                            try
-                            {
-                                newData.ReceiveDate = Funs.GetNewDateTime(tempData.Value1.Trim());
-                            }
-                            catch (Exception)
-                            {
-                                errInfo += "日期格式不正确；";
-                            }
-                        }
-                        else
-                        {
-                            errInfo += "日期为必填项；";
-                        }
-
-                        if (!string.IsNullOrEmpty(tempData.Value2.Trim()))
-                        {
-                            newData.FileCode = tempData.Value2.Trim();
-                        }
-                        else
-                        {
-                            errInfo += "文件号为必填项；";
-                        }
-                        if (!string.IsNullOrEmpty(tempData.Value3.Trim()))
-                        {
-                            newData.FileName = tempData.Value3.Trim();
-                        }
-                        else
-                        {
-                            errInfo += "文件名称为必填项；";
-                        }
-                        if (!string.IsNullOrEmpty(tempData.Value4.Trim()))
-                        {
-                            newData.FileType = tempData.Value4.Trim();
-                        }
-                        else
-                        {
-                            errInfo += "文件类别为必填项；";
-                        }
-                        if (!string.IsNullOrEmpty(tempData.Value5.Trim()))
-                        {
-                            var professional = cNProfessionals.FirstOrDefault(e => e.ProfessionalName == tempData.Value5.Trim());
-                            if (professional != null)
-                            {
-                                newData.CNProfessionalId = professional.CNProfessionalId;
-                            }
-                            else
-                            {
-                                errInfo += "专业不存在；";
-                            }
-                        }
-                        else
-                        {
-                            errInfo += "专业为必填项；";
-                        }
-                        if (!string.IsNullOrEmpty(tempData.Value6.Trim()))
-                        {
-                            var unit = units.FirstOrDefault(e => e.UnitName == tempData.Value6.Trim());
-                            if (unit != null)
-                            {
-                                newData.SendUnit = unit.UnitId;
-                            }
-                            else
-                            {
-                                errInfo += "发件单位不存在；";
-                            }
-                        }
-                        else
-                        {
-                            errInfo += "发件单位为必填项；";
-                        }
-                        if (!string.IsNullOrEmpty(tempData.Value7.Trim()))//发件人 
-                        {
-                            newData.SendMan = tempData.Value7.Trim();
-                        }
-                        else
-                        {
-                            errInfo += "发件人为必填项；";
-                        }
-                        if (!string.IsNullOrEmpty(tempData.Value8.Trim()))//份数  
-                        {
-                            try
-                            {
-                                newData.Copies = Funs.GetNewInt(tempData.Value8.Trim());
-                            }
-                            catch (Exception)
-                            {
-                                errInfo += "份数格式不正确；";
-                            }
-                        }
-                        else
-                        {
-                            errInfo += "份数为必填项；";
-                        }
-                        if (!string.IsNullOrEmpty(tempData.Value9.Trim())) //文件处理人 
-                        {
-                            newData.DocumentHandler = tempData.Value9.Trim();
-                        }
-                        if (!string.IsNullOrEmpty(tempData.Value10.Trim())) //发出日期    
-                        {
-                            try
-                            {
-                                newData.SendDate = Funs.GetNewDateTime(tempData.Value10.Trim());
-                            }
-                            catch (Exception)
-                            {
-                                errInfo += "发出日期格式不正确；";
-                            }
-                        }
-                        if (!string.IsNullOrEmpty(tempData.Value11.Trim()))//接收单位 
-                        {
-                            string unitList = string.Empty;
-                            List<string> lists = tempData.Value11.Trim().Split(',').ToList();
-                            if (lists.Count > 0)
-                            {
-                                foreach (var item in lists)
-                                {
-                                    var unit = units.FirstOrDefault(x => x.UnitName == item.Trim());
-                                    if (unit != null)
-                                    {
-                                        unitList += unit.UnitId + ",";
-                                    }
-                                    else
-                                    {
-                                        errInfo += "接收单位不存在；";
-                                    }
-                                }
-                                if (!string.IsNullOrEmpty(unitList))
-                                {
-                                    newData.ReceiveUnit = unitList.Substring(0, unitList.LastIndexOf(","));
-                                }
-                            }
-                        }
-                        if (!string.IsNullOrEmpty(tempData.Value12.Trim()))//接收人 
-                        {
-                            newData.ReceiveMan = tempData.Value12.Trim();
-                        }
-                        if (tempData.Value13.Trim() == "是") //是否需回复 
-                        {
-                            newData.IsReply = true;
-                        }
-                        else
-                        {
-                            newData.IsReply = false;
-                        }
-                        if (!string.IsNullOrEmpty(tempData.Value14.Trim())) //返回五环日期  
-                        {
-                            try
-                            {
-                                newData.ReturnWuhuangDate = Funs.GetNewDateTime(tempData.Value14.Trim());
-                            }
-                            catch (Exception)
-                            {
-                                errInfo += "返回五环日期格式不正确；";
-                            }
-                        }
-                        if (!string.IsNullOrEmpty(tempData.Value15.Trim()))//返回五环份数 
-                        {
-                            try
-                            {
-                                newData.RetrunWuhuangCopies = Funs.GetNewInt(tempData.Value15.Trim());
-                            }
-                            catch (Exception)
-                            {
-                                errInfo += "返回五环份数格式不正确；";
-                            }
-                        }
-                        if (!string.IsNullOrEmpty(tempData.Value16.Trim()))//下发至单位   
-                        {
-                            string unitLists = string.Empty;
-                            List<string> lists = tempData.Value16.Trim().Split(',').ToList();
-                            if (lists.Count > 0)
-                            {
-                                foreach (var item in lists)
-                                {
-                                    var unit = units.FirstOrDefault(x => x.UnitName == item.Trim());
-                                    if (unit != null)
-                                    {
-                                        unitLists += unit.UnitId + ",";
-                                    }
-                                    else
-                                    {
-                                        errInfo += "下发至单位不存在；";
-                                    }
-                                }
-                                if (!string.IsNullOrEmpty(unitLists))
-                                {
-                                    newData.IssueToUnit = unitLists.Substring(0, unitLists.LastIndexOf(","));
-                                }
-                            }
-                        }
-                        if (!string.IsNullOrEmpty(tempData.Value17.Trim())) //下发份数 
-                        {
-                            try
-                            {
-                                newData.IssueCopies = Funs.GetNewInt(tempData.Value17.Trim());
-                            }
-                            catch (Exception)
-                            {
-                                errInfo += "下发份数格式不正确；";
-                            }
-                        }
-                        if (!string.IsNullOrEmpty(tempData.Value18.Trim()))//下发单位接收人 
-                        {
-                            newData.IssueUnitReceiver = tempData.Value18.Trim();
-                        }
-                        if (!string.IsNullOrEmpty(tempData.Value19.Trim())) //是否存档
-                        {
-                            if (tempData.Value19.Trim() == "是")
-                            {
-                                newData.IsOnFile = true;
-                            }
-                            else
-                            {
-                                newData.IsOnFile = false;
-                            }
-                        }
-                        if (string.IsNullOrEmpty(errInfo)) ////所有信息正确的话 这插入管线焊口
-                        {
-                            newData.ProjectId = this.CurrUser.LoginProjectId;
-
-                            var data = BLL.DataReceivingDocService.GetDataReceivingDocByCodeAndName(newData.FileCode, newData.FileName);
-                            if (data == null)
-                            {
-                                newData.DataReceivingDocId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DataReceivingDoc));
-                                BLL.DataReceivingDocService.AddDataReceivingDoc(newData);
-                            }
-                            else
-                            {
-                                newData.DataReceivingDocId = data.DataReceivingDocId;
-                                BLL.DataReceivingDocService.UpdateDataReceivingDoc(newData);
-                            }
-
-                            BLL.Sys_DataTempService.DeleteDataInTempByDataInTempID(tempData.TempId);
-                            okCount++;
-                        }
+                        result += (i + 2).ToString() + "," + "日期" + "," + "此项为必填项！" + "|";
                     }
                     else
                     {
-                        errInfo = "该条记录已存在于资料收发文登记记录表中。";
+                        try
+                        {
+                            DateTime d = Convert.ToDateTime(row0);
+                        }
+                        catch (Exception)
+                        {
+                            result += (i + 2).ToString() + "," + "日期" + "," + "错误！" + "|";
+                        }
                     }
 
-                    if (!string.IsNullOrEmpty(errInfo))
+                    string row1 = pds.Rows[i][1].ToString();
+                    if (string.IsNullOrEmpty(row1))
                     {
-                        tempData.ToopValue = errInfo;
-                        BLL.Sys_DataTempService.UpdateDataInTemp(tempData);
-                        erreMessage += errInfo + ";";
+                        result += (i + 2).ToString() + "," + "文件号" + "," + "此项为必填项！" + "|";
+                    }
+
+                    string row2 = pds.Rows[i][2].ToString();
+                    if (string.IsNullOrEmpty(row2))
+                    {
+                        result += (i + 2).ToString() + "," + "文件名称" + "," + "此项为必填项！" + "|";
+                    }
+
+                    string row3 = pds.Rows[i][3].ToString();
+                    if (string.IsNullOrEmpty(row3))
+                    {
+                        result += (i + 2).ToString() + "," + "文件类别" + "," + "此项为必填项！" + "|";
+                    }
+
+                    string row4 = pds.Rows[i][4].ToString().Trim();
+                    if (string.IsNullOrEmpty(row4))
+                    {
+                        result += (i + 2).ToString() + "," + "专业" + "," + "此项为必填项！" + "|";
+                    }
+                    else
+                    {
+                        var u = cns.Where(x => x.ProfessionalName == row4).FirstOrDefault();
+                        if (u == null)
+                        {
+                            result += (i + 2).ToString() + "," + "专业" + "," + "[" + row4 + "]不存在！" + "|";
+                        }
+                    }
+
+                    string row5 = pds.Rows[i][5].ToString().Trim();
+                    if (string.IsNullOrEmpty(row5))
+                    {
+                        result += (i + 2).ToString() + "," + "发件单位" + "," + "此项为必填项！" + "|";
+                    }
+                    else
+                    {
+                        var u = units.Where(x => x.UnitName == row5).FirstOrDefault();
+                        if (u == null)
+                        {
+                            result += (i + 2).ToString() + "," + "发件单位" + "," + "[" + row5 + "]不存在！" + "|";
+                        }
+                    }
+
+                    string row6 = pds.Rows[i][6].ToString().Trim();
+                    if (string.IsNullOrEmpty(row6))
+                    {
+                        result += (i + 2).ToString() + "," + "发件人" + "," + "此项为必填项！" + "|";
+                    }
+
+                    string row7 = pds.Rows[i][7].ToString().Trim();
+                    if (string.IsNullOrEmpty(row7))
+                    {
+                        result += (i + 2).ToString() + "," + "份数" + "," + "此项为必填项！" + "|";
+                    }
+                    else
+                    {
+                        try
+                        {
+                            int f = Convert.ToInt32(row7);
+                        }
+                        catch (Exception)
+                        {
+                            result += (i + 2).ToString() + "," + "份数" + "," + "格式错误！" + "|";
+                        }
+                    }
+
+                    string row9 = pds.Rows[i][9].ToString();
+                    if (string.IsNullOrEmpty(row9))
+                    {
+                        result += (i + 2).ToString() + "," + "发出日期" + "," + "此项为必填项！" + "|";
+                    }
+                    else
+                    {
+                        try
+                        {
+                            DateTime d = Convert.ToDateTime(row9);
+                        }
+                        catch (Exception)
+                        {
+                            result += (i + 2).ToString() + "," + "发出日期" + "," + "格式错误！" + "|";
+                        }
+                    }
+                
+                    string row10 = pds.Rows[i][10].ToString().Trim();
+                    if (!string.IsNullOrEmpty(row10))
+                    {
+                        string[] reunit = row10.Split(',');
+                        foreach (string u in reunit)
+                        {
+                            var unit = units.Where(x => x.UnitName == u.Trim()).FirstOrDefault();
+                            if (unit == null)
+                            {
+                                result += (i + 2).ToString() + "," + "接收单位" + "," + "[" + u.Trim() + "]不存在！" + "|";
+                            }
+                        }
+                    }
+
+                    string row12 = pds.Rows[i][12].ToString().Trim();
+                    if (row12 != "是" && row12 != "否")
+                    {
+                        result += (i + 2).ToString() + "," + "是否需回复" + "," + "错误！" + "|";
+                    }
+
+                    string row13 = pds.Rows[i][13].ToString().Trim();
+                    if (!string.IsNullOrEmpty(row13))
+                    {
+                        try
+                        {
+                            DateTime d = Convert.ToDateTime(row0);
+                        }
+                        catch (Exception)
+                        {
+                            result += (i + 2).ToString() + "," + "返回五环日期" + "," + "格式错误！" + "|";
+                        }
+                    }
+
+                    string row14 = pds.Rows[i][14].ToString().Trim();
+                    if (!string.IsNullOrEmpty(row14))
+                    {
+                        try
+                        {
+                            int d = Convert.ToInt32(row14);
+                        }
+                        catch (Exception)
+                        {
+                            result += (i + 2).ToString() + "," + "返回五环份数" + "," + "格式错误！" + "|";
+                        }
+                    }
+
+                    string row15 = pds.Rows[i][15].ToString().Trim();
+                    if (!string.IsNullOrEmpty(row15))
+                    {
+                        string[] reunit = row15.Split(',');
+                        foreach (string unit in reunit)
+                        {
+                            var u = units.Where(x => x.UnitName == unit.Trim()).FirstOrDefault();
+                            if (u == null)
+                            {
+                                result += (i + 2).ToString() + "," + "下发至单位" + "," + "[" + unit.Trim() + "]不存在！" + "|";
+                            }
+                        }
+                    }
+
+                    string row16 = pds.Rows[i][16].ToString().Trim();
+                    if (!string.IsNullOrEmpty(row16))
+                    {
+                        try
+                        {
+                            int d = Convert.ToInt32(row16);
+                        }
+                        catch (Exception)
+                        {
+                            result += (i + 2).ToString() + "," + "下发份数" + "," + "格式错误！" + "|";
+                        }
+                    }
+
+                    string row18 = pds.Rows[i][18].ToString().Trim();
+                    if (!string.IsNullOrEmpty(row18))
+                    {                    
+                        if (row18 != "是" && row18 != "否")
+                        {
+                            result += (i + 2).ToString() + "," + "是否存档" + "," + "[" + row18 + "]错误！" + "|";
+                        }
+                    }
+
+                    string row19 = pds.Rows[i][19].ToString();
+                    if (string.IsNullOrEmpty(row19))
+                    {
+                        result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|";
                     }
                 }
+                if (!string.IsNullOrEmpty(result))
+                {
+                    result = result.Substring(0, result.LastIndexOf("|"));
+                }
+                errorInfos.Clear();
+                if (!string.IsNullOrEmpty(result))
+                {
+                    string results = result;
+                    List<string> errorInfoList = results.Split('|').ToList();
+                    foreach (var item in errorInfoList)
+                    {
+                        string[] errors = item.Split(',');
+                        Model.ErrorInfo errorInfo = new Model.ErrorInfo();
+                        errorInfo.Row = errors[0];
+                        errorInfo.Column = errors[1];
+                        errorInfo.Reason = errors[2];
+                        errorInfos.Add(errorInfo);
+                    }
+                    if (errorInfos.Count > 0)
+                    {
+                        this.gvErrorInfo.DataSource = errorInfos;
+                        this.gvErrorInfo.DataBind();
+                    }
+                }
+                else
+                {
+                    ShowNotify("审核完成,请点击导入！", MessageBoxIcon.Success);
+                }
+            }
+            else
+            {
+                ShowNotify("导入数据为空！", MessageBoxIcon.Warning);
+            }
+            return true;
+        }
+        #endregion
+        #endregion
+
+        #region 导入
+        /// <summary>
+        /// 导入
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnImport_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(hdCheckResult.Text))
+            {
+                if (errorInfos.Count <= 0)
+                {
+                    string rootPath = Server.MapPath("~/");
+                    ImportXlsToData2(rootPath + initPath + this.hdFileName.Text);
+                    hdCheckResult.Text = string.Empty;
+                    ShowNotify("导入成功！", MessageBoxIcon.Success);
+                    PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                }
+                else
+                {
+                    ShowNotify("请先将错误数据修正，再重新导入提交！", MessageBoxIcon.Warning);
+                }
+            }
+            else
+            {
+                ShowNotify("请先审核要导入的文件！", MessageBoxIcon.Warning);
+            }
+        }
+
+        #region Excel提取数据
+        /// <summary>
+        /// 从Excel提取数据--》Dataset
+        /// </summary>
+        /// <param name="filename">Excel文件路径名</param>
+        private void ImportXlsToData2(string fileName)
+        {
+            try
+            {
+                string oleDBConnString = String.Empty;
+                oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
+                oleDBConnString += "Data Source=";
+                oleDBConnString += fileName;
+                oleDBConnString += ";Extended Properties=Excel 8.0;";
+                OleDbConnection oleDBConn = null;
+                OleDbDataAdapter oleAdMaster = null;
+                DataTable m_tableName = new DataTable();
+                DataSet ds = new DataSet();
+
+                oleDBConn = new OleDbConnection(oleDBConnString);
+                oleDBConn.Open();
+                m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null);
+
+                if (m_tableName != null && m_tableName.Rows.Count > 0)
+                {
+
+                    m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim();
+
+                }
+                string sqlMaster;
+                sqlMaster = " SELECT *  FROM [" + m_tableName.TableName + "]";
+                oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn);
+                oleAdMaster.Fill(ds, "m_tableName");
+                oleAdMaster.Dispose();
+                oleDBConn.Close();
+                oleDBConn.Dispose();
+
+                AddDatasetToSQL2(ds.Tables[0], 20);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
             }
         }
         #endregion
 
-        #region 导出按钮
-        /// 导出按钮
+        #region 将Dataset的数据导入数据库
+        /// <summary>
+        /// 将Dataset的数据导入数据库
+        /// </summary>
+        /// <param name="pds">数据集</param>
+        /// <param name="Cols">数据集列数</param>
+        /// <returns></returns>
+        private bool AddDatasetToSQL2(DataTable pds, int Cols)
+        {
+            int ic, ir;
+            ic = pds.Columns.Count;
+            if (ic < Cols)
+            {
+                ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
+            }
+            string result = string.Empty;
+            ir = pds.Rows.Count;
+            if (pds != null && ir > 0)
+            {
+                var oldViewInfos = from x in Funs.DB.Comprehensive_DataReceivingDoc
+                                   where x.ProjectId == this.CurrUser.LoginProjectId
+                                   select x;
+
+                var units = from x in Funs.DB.Base_Unit
+                            join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId
+                            where y.ProjectId == this.CurrUser.LoginProjectId
+                            select x;
+
+                var cns = from x in Funs.DB.Base_CNProfessional select x;
+                
+                for (int i = 0; i < ir; i++)
+                {
+                    Model.Comprehensive_DataReceivingDoc oldViewInfo = new Model.Comprehensive_DataReceivingDoc();
+                    var cn = cns.Where(y => y.ProfessionalName == pds.Rows[i][4].ToString().Trim()).FirstOrDefault();
+                    var unit = units.Where(y => y.UnitName == pds.Rows[i][5].ToString().Trim()).FirstOrDefault();
+
+                    oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][19].ToString().Trim()
+                                                         ).FirstOrDefault();
+                    if (oldViewInfo == null)
+                    {
+                        Model.Comprehensive_DataReceivingDoc des = new Model.Comprehensive_DataReceivingDoc();
+                        des.DataReceivingDocId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DataReceivingDoc));
+                        des.ProjectId = this.CurrUser.LoginProjectId;
+                        des.ReceiveDate = Funs.GetNewDateTime(pds.Rows[i][0].ToString().Trim());
+                        des.FileCode = pds.Rows[i][1].ToString().Trim();
+                        des.FileName= pds.Rows[i][2].ToString().Trim();
+                        des.FileType= pds.Rows[i][3].ToString().Trim();
+                        des.CNProfessionalId = cn.CNProfessionalId;
+                        des.SendUnit = unit.UnitId;
+                        des.SendMan= pds.Rows[i][6].ToString().Trim();
+                        des.Copies = Funs.GetNewInt(pds.Rows[i][7].ToString().Trim());
+                        des.DocumentHandler = pds.Rows[i][8].ToString().Trim();
+                        des.SendDate = Funs.GetNewDateTime(pds.Rows[i][9].ToString().Trim());
+                        if (!string.IsNullOrEmpty(pds.Rows[i][10].ToString().Trim()))
+                        {
+                            des.ReceiveUnit = BLL.UnitService.GetUnitIds(pds.Rows[i][10].ToString().Trim());
+                        }
+                        des.ReceiveMan = pds.Rows[i][11].ToString().Trim();
+                        if (!string.IsNullOrEmpty(pds.Rows[i][12].ToString().Trim()))
+                        {
+                            if (pds.Rows[i][12].ToString().Trim() == "是")
+                            {
+                                des.IsReply = true;
+                            }
+                            else
+                            {
+                                des.IsReply = false;
+                            }
+                        }
+                        des.ReturnWuhuangDate = Funs.GetNewDateTime(pds.Rows[i][13].ToString().Trim());
+                        des.RetrunWuhuangCopies = Funs.GetNewInt(pds.Rows[i][14].ToString().Trim());
+                        if (!string.IsNullOrEmpty(pds.Rows[i][15].ToString().Trim()))
+                        {
+                            des.IssueToUnit = BLL.UnitService.GetUnitIds(pds.Rows[i][15].ToString().Trim());
+                        }
+                        des.IssueCopies = Funs.GetNewInt(pds.Rows[i][16].ToString().Trim());
+                        des.IssueUnitReceiver = pds.Rows[i][17].ToString().Trim();
+                        if (!string.IsNullOrEmpty(pds.Rows[i][18].ToString().Trim()))
+                        {
+                            if (pds.Rows[i][18].ToString().Trim() == "是")
+                            {
+                                des.IsOnFile = true;
+                            }
+                            else if (pds.Rows[i][18].ToString().Trim() == "否")
+                            {
+                                des.IsOnFile = false;
+                            }
+                        }
+                        des.RemarkCode = pds.Rows[i][19].ToString().Trim();
+                        BLL.DataReceivingDocService.AddDataReceivingDoc(des);
+                    }
+                }
+            }
+            else
+            {
+                ShowNotify("导入数据为空！", MessageBoxIcon.Warning);
+            }
+            return true;
+        }
+        #endregion
+        #endregion
+
+        #region 下载模板
+        /// <summary>
+        /// 下载模板按钮
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        protected void btnOut_Click(object sender, EventArgs e)
+        protected void btnDownLoad_Click(object sender, EventArgs e)
         {
-            Response.ClearContent();
-            string filename = Funs.GetNewFileName();
-            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("资料收发文登记记录导入模板" + filename, System.Text.Encoding.UTF8) + ".xlsx");
-            Response.ContentType = "application/excel";
-            Response.ContentEncoding = System.Text.Encoding.UTF8;
-            Response.Write(GetGridTableHtml(Grid1));
-            Response.End();
+            PageContext.RegisterStartupScript(Confirm.GetShowReference("确定下载导入模板吗？", String.Empty, MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_OK"), PageManager1.GetCustomEventReference("Confirm_Cancel")));
+        }
+
+        /// <summary>
+        /// 下载导入模板
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void PageManager1_CustomEvent(object sender, CustomEventArgs e)
+        {
+            if (e.EventArgument == "Confirm_OK")
+            {
+                string rootPath = Server.MapPath("~/");
+                string uploadfilepath = rootPath + Const.CQMS_DataReceivingDocTempUrl;
+                string filePath = Const.NCRManagementDataInUrl;
+                string fileName = Path.GetFileName(filePath);
+                FileInfo info = new FileInfo(uploadfilepath);
+                long fileSize = info.Length;
+                Response.ClearContent();
+                Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+                Response.ContentType = "excel/plain";
+                Response.ContentEncoding = System.Text.Encoding.UTF8;
+                Response.AddHeader("Content-Length", fileSize.ToString().Trim());
+                Response.TransmitFile(uploadfilepath, 0, fileSize);
+                Response.End();
+            }
         }
         #endregion
     }
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx.designer.cs
index f0af2d6c..2d81b8db 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx.designer.cs
@@ -31,130 +31,85 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         protected global::FineUIPro.PageManager PageManager1;
         
         /// <summary>
-        /// id 控件。
+        /// SimpleForm1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField id;
+        protected global::FineUIPro.Form SimpleForm1;
         
         /// <summary>
-        /// Panel1 控件。
+        /// Toolbar2 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Panel Panel1;
+        protected global::FineUIPro.Toolbar Toolbar2;
         
         /// <summary>
-        /// Toolbar1 控件。
+        /// hdFileName 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Toolbar Toolbar1;
+        protected global::FineUIPro.HiddenField hdFileName;
         
         /// <summary>
-        /// hdfileName 控件。
+        /// btnAudit 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hdfileName;
+        protected global::FineUIPro.Button btnAudit;
         
         /// <summary>
-        /// FileExcel 控件。
+        /// btnImport 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.FileUpload FileExcel;
+        protected global::FineUIPro.Button btnImport;
         
         /// <summary>
-        /// imgbtnImport 控件。
+        /// btnDownLoad 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Button imgbtnImport;
+        protected global::FineUIPro.Button btnDownLoad;
         
         /// <summary>
-        /// ToolbarFill1 控件。
+        /// hdCheckResult 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+        protected global::FineUIPro.HiddenField hdCheckResult;
         
         /// <summary>
-        /// ckUpdate 控件。
+        /// fuAttachUrl 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.CheckBox ckUpdate;
+        protected global::FineUIPro.FileUpload fuAttachUrl;
         
         /// <summary>
-        /// btnSave 控件。
+        /// gvErrorInfo 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Button btnSave;
-        
-        /// <summary>
-        /// btnRefresh 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnRefresh;
-        
-        /// <summary>
-        /// btnAllDelete 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnAllDelete;
-        
-        /// <summary>
-        /// btnOut 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnOut;
-        
-        /// <summary>
-        /// imgbtnUpload 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button imgbtnUpload;
-        
-        /// <summary>
-        /// Grid1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Grid Grid1;
+        protected global::FineUIPro.Grid gvErrorInfo;
         
         /// <summary>
         /// lblPageIndex 控件。
@@ -164,104 +119,5 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </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;
-        
-        /// <summary>
-        /// lbDataCout 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label lbDataCout;
-        
-        /// <summary>
-        /// Window1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Window Window1;
-        
-        /// <summary>
-        /// Window2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Window Window2;
-        
-        /// <summary>
-        /// ContentPanel3 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.ContentPanel ContentPanel3;
-        
-        /// <summary>
-        /// Menu1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Menu Menu1;
-        
-        /// <summary>
-        /// btnMenuEdit 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.MenuButton btnMenuEdit;
-        
-        /// <summary>
-        /// btnMenuDelete 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.MenuButton btnMenuDelete;
-        
-        /// <summary>
-        /// ScriptManager2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.ScriptManager ScriptManager2;
     }
 }
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx.cs
index 67bfcaca..2c75e04f 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx.cs
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL(ds.Tables[0], 10);
+                AddDatasetToSQL(ds.Tables[0], 11);
                 hdCheckResult.Text = "1";
             }
             catch (Exception exc)
@@ -246,6 +246,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                         }
                     }
 
+                    string row10 = pds.Rows[i][10].ToString();
+                    if (string.IsNullOrEmpty(row10))
+                    {
+                        result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|";
+                    }
                 }
                 if (!string.IsNullOrEmpty(result))
                 {
@@ -351,7 +356,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL2(ds.Tables[0], 10);
+                AddDatasetToSQL2(ds.Tables[0], 11);
             }
             catch (Exception ex)
             {
@@ -391,7 +396,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                                    select x;
                 for (int i = 0; i < ir; i++)
                 {
-                    var oldViewInfo = oldViewInfos.Where(x => x.ChangeOrderCode == pds.Rows[i][2].ToString().Trim()).FirstOrDefault();
+                    var oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][10].ToString().Trim()).FirstOrDefault();
                     if (oldViewInfo == null)
                     {
                         Model.Comprehensive_DesignChangeOrder Ins = new Model.Comprehensive_DesignChangeOrder();
@@ -443,7 +448,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                                 Ins.HandleState = "3";
                             }
                         }
-
+                        Ins.RemarkCode = pds.Rows[i][10].ToString().Trim();
                         Ins.DesignChangeOrderId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignChangeOrder));
                         Ins.CompileMan = this.CurrUser.UserId;
                         Ins.CompileDate = DateTime.Now.Date;
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs
index 5dbff734..10c4bd77 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL(ds.Tables[0], 11);
+                AddDatasetToSQL(ds.Tables[0], 12);
                 hdCheckResult.Text = "1";
             }
             catch (Exception exc)
@@ -173,6 +173,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var cns = from x in Funs.DB.Base_CNProfessional select x;
 
+                var unitWorks = from x in Funs.DB.WBS_UnitWork
+                                where x.ProjectId == this.CurrUser.LoginProjectId
+                                && x.SuperUnitWork == null
+                                select x;
+
                 for (int i = 0; i < ir; i++)
                 {
                     string row0 = pds.Rows[i][0].ToString();
@@ -196,35 +201,23 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     }
 
                     string row2 = pds.Rows[i][2].ToString();
-                    if (string.IsNullOrEmpty(row2))
+                    if (!string.IsNullOrEmpty(row2))
                     {
-                        result += (i + 2).ToString() + "," + "图纸内容" + "," + "此项为必填项！" + "|";
-                    }
-
-                    string row4 = pds.Rows[i][4].ToString();
-                    if (!string.IsNullOrEmpty(row4))
-                    {
-                        try
+                        string[] reunit = row2.Split(',');
+                        foreach (string unitWork in reunit)
                         {
-                            Int32 date = Convert.ToInt32(row4.Trim());
-                        }
-                        catch (Exception)
-                        {
-                            result += (i + 2).ToString() + "," + "页数" + "," + "[" + row4 + "]错误！" + "|";
+                            var u = unitWorks.Where(x => x.UnitWorkName == unitWork.Trim()).FirstOrDefault();
+                            if (u == null)
+                            {
+                                result += (i + 2).ToString() + "," + "单位工程名称" + "," + "[" + unitWork.Trim() + "]不存在！" + "|";
+                            }
                         }
                     }
 
                     string row5 = pds.Rows[i][5].ToString();
-                    if (!string.IsNullOrEmpty(row5))
+                    if (string.IsNullOrEmpty(row5))
                     {
-                        try
-                        {
-                            DateTime date = Convert.ToDateTime(row5.Trim());
-                        }
-                        catch (Exception)
-                        {
-                            result += (i + 2).ToString() + "," + "接收日期" + "," + "[" + row5 + "]错误！" + "|";
-                        }
+                        result += (i + 2).ToString() + "," + "标识编号" + "," + "此项为必填项！" + "|";
                     }
 
                     string row6 = pds.Rows[i][6].ToString();
@@ -232,38 +225,53 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     {
                         try
                         {
-                            DateTime date = Convert.ToDateTime(row6.Trim());
+                            Int32 date = Convert.ToInt32(row6.Trim());
                         }
                         catch (Exception)
                         {
-                            result += (i + 2).ToString() + "," + "发送日期" + "," + "[" + row6 + "]错误！" + "|";
+                            result += (i + 2).ToString() + "," + "页数" + "," + "[" + row6 + "]错误！" + "|";
                         }
                     }
 
                     string row7 = pds.Rows[i][7].ToString();
                     if (!string.IsNullOrEmpty(row7))
                     {
-                        string[] reunit = row7.Split(',');
-                        foreach (string unit in reunit)
+                        try
                         {
-                            var u = units.Where(x => x.UnitName == unit).FirstOrDefault();
-                            if (u == null)
-                            {
-                                result += (i + 2).ToString() + "," + "接收单位" + "," + "[" + unit + "]不存在！" + "|";
-                            }
+                            DateTime date = Convert.ToDateTime(row7.Trim());
+                        }
+                        catch (Exception)
+                        {
+                            result += (i + 2).ToString() + "," + "接收日期" + "," + "[" + row7 + "]错误！" + "|";
                         }
                     }
 
-                    string row10 = pds.Rows[i][10].ToString();
-                    if (string.IsNullOrEmpty(row10))
+                    string row8 = pds.Rows[i][8].ToString();
+                    if (!string.IsNullOrEmpty(row8))
                     {
-                        result += (i + 2).ToString() + "," + "标识编号" + "," + "此项为必填项！" + "|";
+                        try
+                        {
+                            DateTime date = Convert.ToDateTime(row8.Trim());
+                        }
+                        catch (Exception)
+                        {
+                            result += (i + 2).ToString() + "," + "发送日期" + "," + "[" + row8 + "]错误！" + "|";
+                        }
+                    }
+
+                    string row9 = pds.Rows[i][9].ToString();
+                    if (!string.IsNullOrEmpty(row9))
+                    {
+                        string[] reunit = row9.Split(',');
+                        foreach (string unit in reunit)
+                        {
+                            var u = units.Where(x => x.UnitName == unit.Trim()).FirstOrDefault();
+                            if (u == null)
+                            {
+                                result += (i + 2).ToString() + "," + "接收单位" + "," + "[" + unit.Trim() + "]不存在！" + "|";
+                            }
+                        }
                     }
-                    //}
-                    //else
-                    //{
-                    //    result += (i + 2).ToString() + "," + "报验编号" + "," + "该单位报验编号已存在！" + "|";
-                    //}
                 }
                 if (!string.IsNullOrEmpty(result))
                 {
@@ -369,7 +377,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL2(ds.Tables[0], 11);
+                AddDatasetToSQL2(ds.Tables[0], 12);
             }
             catch (Exception ex)
             {
@@ -408,72 +416,84 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var cns = from x in Funs.DB.Base_CNProfessional select x;
 
+                var unitWorks = from x in Funs.DB.WBS_UnitWork
+                                where x.ProjectId == this.CurrUser.LoginProjectId
+                                && x.SuperUnitWork == null
+                                select x;
+
                 for (int i = 0; i < ir; i++)
                 {
                     Model.Comprehensive_DesignDrawings oldViewInfo = new Model.Comprehensive_DesignDrawings();
                     string row0 = pds.Rows[i][0].ToString().Trim();
                     var cn = cns.Where(y => y.ProfessionalName == row0).FirstOrDefault();
-                    oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][10].ToString().Trim()
+                    oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][5].ToString().Trim()
                                                          ).FirstOrDefault();
                     if (oldViewInfo == null)
                     {
                         Model.Comprehensive_DesignDrawings des = new Model.Comprehensive_DesignDrawings();
                         des.DesignDrawingsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDrawings));
                         des.ProjectId = this.CurrUser.LoginProjectId;
-                        des.CNProfessionalId = cn.CNProfessionalId;
-                        des.DesignDrawingsCode = pds.Rows[i][1].ToString().Trim();
-                        des.DesignDrawingsContent = pds.Rows[i][2].ToString().Trim();
-                        des.Edition = pds.Rows[i][3].ToString().Trim();
-                        if (!string.IsNullOrEmpty(pds.Rows[i][4].ToString().Trim()))
+                        des.CNProfessionalId = cn.CNProfessionalId;//专业名称
+                        des.DesignDrawingsCode = pds.Rows[i][1].ToString().Trim();//图纸编号
+                        if (!string.IsNullOrEmpty(pds.Rows[i][2].ToString().Trim()))//单位工程
                         {
-                            des.PageNumber = Convert.ToInt32(pds.Rows[i][4].ToString().Trim());
-                        }
-                        if (!string.IsNullOrEmpty(pds.Rows[i][5].ToString().Trim()))
-                        {
-                            des.ReceiveDate = Convert.ToDateTime(pds.Rows[i][5].ToString().Trim());
+                            des.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][2].ToString().Trim());
                         }
+                        des.DesignDrawingsContent = pds.Rows[i][3].ToString().Trim();//图纸内容
+                        des.Edition = pds.Rows[i][4].ToString().Trim();//版次
+                        des.RemarkCode = pds.Rows[i][5].ToString().Trim();//标志编号
                         if (!string.IsNullOrEmpty(pds.Rows[i][6].ToString().Trim()))
                         {
-                            des.SendDate = Convert.ToDateTime(pds.Rows[i][6].ToString().Trim());
+                            des.PageNumber = Convert.ToInt32(pds.Rows[i][6].ToString().Trim());//页数
                         }
                         if (!string.IsNullOrEmpty(pds.Rows[i][7].ToString().Trim()))
                         {
-                            des.ReceiveUnits = UnitService.GetUnitIds(pds.Rows[i][7].ToString().Trim());
+                            des.ReceiveDate = Convert.ToDateTime(pds.Rows[i][7].ToString().Trim());//接收日期
                         }
-                        des.ReceiveMan = pds.Rows[i][8].ToString().Trim();
-                        des.Remark = pds.Rows[i][9].ToString().Trim();
-                        des.RemarkCode = pds.Rows[i][10].ToString().Trim();
+                        if (!string.IsNullOrEmpty(pds.Rows[i][8].ToString().Trim()))
+                        {
+                            des.SendDate = Convert.ToDateTime(pds.Rows[i][8].ToString().Trim());//发送日期
+                        }
+                        if (!string.IsNullOrEmpty(pds.Rows[i][9].ToString().Trim()))
+                        {
+                            des.ReceiveUnits = UnitService.GetUnitIds(pds.Rows[i][9].ToString().Trim());//接收单位
+                        }
+                        des.ReceiveMan = pds.Rows[i][10].ToString().Trim(); //接收人
+                        des.Remark = pds.Rows[i][11].ToString().Trim();//备注
                         BLL.DesignDrawingsService.AddDesignDrawings(des);
                     }
                     else
                     {
-                        oldViewInfo.CNProfessionalId = cn.CNProfessionalId;
-                        oldViewInfo.DesignDrawingsCode = pds.Rows[i][1].ToString().Trim();
-                        oldViewInfo.DesignDrawingsContent = pds.Rows[i][2].ToString().Trim();
-                        oldViewInfo.Edition = pds.Rows[i][3].ToString().Trim();
-                        if (!string.IsNullOrEmpty(pds.Rows[i][4].ToString().Trim()))
+                        oldViewInfo.CNProfessionalId = cn.CNProfessionalId;//专业名称
+                        oldViewInfo.DesignDrawingsCode = pds.Rows[i][1].ToString().Trim();//图纸编号
+                        if (!string.IsNullOrEmpty(pds.Rows[i][2].ToString().Trim()))//单位工程
                         {
-                            oldViewInfo.PageNumber = Convert.ToInt32(pds.Rows[i][4].ToString().Trim());
-                        }
-                        if (!string.IsNullOrEmpty(pds.Rows[i][5].ToString().Trim()))
-                        {
-                            oldViewInfo.ReceiveDate = Convert.ToDateTime(pds.Rows[i][5].ToString().Trim());
+                            oldViewInfo.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][2].ToString().Trim());
                         }
+                        oldViewInfo.DesignDrawingsContent = pds.Rows[i][3].ToString().Trim();//图纸内容
+                        oldViewInfo.Edition = pds.Rows[i][4].ToString().Trim();//版次
+                        oldViewInfo.RemarkCode = pds.Rows[i][5].ToString().Trim();//标志编号
                         if (!string.IsNullOrEmpty(pds.Rows[i][6].ToString().Trim()))
                         {
-                            oldViewInfo.SendDate = Convert.ToDateTime(pds.Rows[i][6].ToString().Trim());
+                            oldViewInfo.PageNumber = Convert.ToInt32(pds.Rows[i][6].ToString().Trim());//页数
                         }
                         if (!string.IsNullOrEmpty(pds.Rows[i][7].ToString().Trim()))
                         {
-                            oldViewInfo.ReceiveUnits = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitName == (pds.Rows[i][7].ToString().Trim())).UnitId;
+                            oldViewInfo.ReceiveDate = Convert.ToDateTime(pds.Rows[i][7].ToString().Trim());//接收日期
                         }
-                        oldViewInfo.ReceiveMan = pds.Rows[i][8].ToString().Trim();
-                        oldViewInfo.Remark = pds.Rows[i][9].ToString().Trim();
-                        oldViewInfo.RemarkCode = pds.Rows[i][10].ToString().Trim();
+                        if (!string.IsNullOrEmpty(pds.Rows[i][8].ToString().Trim()))
+                        {
+                            oldViewInfo.SendDate = Convert.ToDateTime(pds.Rows[i][8].ToString().Trim());//发送日期
+                        }
+                        if (!string.IsNullOrEmpty(pds.Rows[i][9].ToString().Trim()))
+                        {
+                            oldViewInfo.ReceiveUnits = UnitService.GetUnitIds(pds.Rows[i][9].ToString().Trim());//接收单位
+                        }
+                        oldViewInfo.ReceiveMan = pds.Rows[i][10].ToString().Trim(); //接收人
+                        oldViewInfo.Remark = pds.Rows[i][11].ToString().Trim();//备注
                         BLL.DesignDrawingsService.UpdateDesignDrawings(oldViewInfo);
                     }
                 }
-
             }
             else
             {
@@ -484,7 +504,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         #endregion
         #endregion
 
-
         #region 下载模板
         /// <summary>
         /// 下载模板按钮
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs
index 44f45368..02b1053e 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL(ds.Tables[0], 13);
+                AddDatasetToSQL(ds.Tables[0], 14);
                 hdCheckResult.Text = "1";
             }
             catch (Exception exc)
@@ -278,13 +278,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                                 result += (i + 2).ToString() + "," + "离场时间" + "," + "[" + row12 + "]错误！" + "|";
                             }
                         }
+                        string row13 = pds.Rows[i][13].ToString();
+                        if (string.IsNullOrEmpty(row13))
+                        {
+                            result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|";
+                        }
                     }
-
                     else
                     {
                         result += (i + 2).ToString() + "," + "单位名称" + "," + "[" + row0 + "]不存在！" + "|";
                     }
-
                 }
                 if (!string.IsNullOrEmpty(result))
                 {
@@ -390,7 +393,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL2(ds.Tables[0], 13);
+                AddDatasetToSQL2(ds.Tables[0], 14);
             }
             catch (Exception ex)
             {
@@ -437,7 +440,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     {
                         Model.Comprehensive_InspectionMachine oldViewInfo = new Model.Comprehensive_InspectionMachine();
                         oldViewInfo = oldViewInfos.FirstOrDefault(x => x.UnitId == unitInfo.UnitId
-                                                                       && x.InspectionMachineCode == pds.Rows[i][1].ToString().Trim());
+                                                                       && x.RemarkCode == pds.Rows[i][13].ToString().Trim());
                         if (oldViewInfo==null)
                         {
                             Model.Comprehensive_InspectionMachine Ins = new Model.Comprehensive_InspectionMachine();
@@ -483,7 +486,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                             {
                                 Ins.LeaveDate = Convert.ToDateTime(pds.Rows[i][12].ToString().Trim());
                             }
-
+                            Ins.RemarkCode = pds.Rows[i][13].ToString().Trim();
                             Ins.InspectionMachineId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionMachine));
                             Ins.CompileMan = this.CurrUser.UserId;
                             Ins.CompileDate = DateTime.Now.Date;
@@ -533,8 +536,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                             {
                                 oldViewInfo.LeaveDate = Convert.ToDateTime(pds.Rows[i][12].ToString().Trim());
                             }
+                            oldViewInfo.RemarkCode = pds.Rows[i][13].ToString().Trim();
 
-                  
                             oldViewInfo.CompileMan = this.CurrUser.UserId;
                             oldViewInfo.CompileDate = DateTime.Now.Date;
                             BLL.InspectionMachineService.UpdateInspectionMachine(oldViewInfo);
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs
index 0fc1f39e..a70751ce 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL(ds.Tables[0], 12);
+                AddDatasetToSQL(ds.Tables[0], 13);
                 hdCheckResult.Text = "1";
             }
             catch (Exception exc)
@@ -273,15 +273,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                                 result += (i + 2).ToString() + "," + "离场时间" + "," + "[" + row10 + "]错误！" + "|";
                             }
                         }
-
-                       
+                        string row12 = pds.Rows[i][12].ToString();
+                        if (string.IsNullOrEmpty(row12))
+                        {
+                            result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|";
+                        }
                     }
-
                     else
                     {
                         result += (i + 2).ToString() + "," + "单位名称" + "," + "[" + row0 + "]不存在！" + "|";
                     }
-
                 }
                 if (!string.IsNullOrEmpty(result))
                 {
@@ -387,7 +388,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL2(ds.Tables[0], 12);
+                AddDatasetToSQL2(ds.Tables[0], 13);
             }
             catch (Exception ex)
             {
@@ -435,7 +436,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     if (unitInfo != null && !string.IsNullOrEmpty(row0))
                     {
                         oldViewInfo = oldViewInfos.Where(x => x.UnitId == unitInfo.UnitId
-                                                           && x.CertificateNumber == pds.Rows[i][5].ToString().Trim()
+                                                           && x.RemarkCode == pds.Rows[i][12].ToString().Trim()
                                                          ).FirstOrDefault();
                         if (oldViewInfo == null)
                         {
@@ -473,6 +474,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                                 Ins.DepartureTime = Convert.ToDateTime(pds.Rows[i][10].ToString().Trim());
                             }
                             Ins.Remark = pds.Rows[i][11].ToString().Trim();
+                            Ins.RemarkCode = pds.Rows[i][12].ToString().Trim();
 
                             Ins.InspectionPersonId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionPerson));
                             Ins.CompileMan = this.CurrUser.UserId;
@@ -531,6 +533,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                                 oldViewInfo.DepartureTime = Convert.ToDateTime(pds.Rows[i][10].ToString().Trim());
                             }
                             oldViewInfo.Remark = pds.Rows[i][11].ToString().Trim();
+                            oldViewInfo.RemarkCode= pds.Rows[i][12].ToString().Trim();
 
                             oldViewInfo.CompileMan = this.CurrUser.UserId;
                             oldViewInfo.CompileDate = DateTime.Now.Date;
@@ -594,7 +597,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         #endregion
         #endregion
 
-
         #region 下载模板
         /// <summary>
         /// 下载模板按钮
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx
index 5e08b175..fa368162 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx
@@ -27,7 +27,7 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="drpPostId" runat="server" Label="工种" LabelWidth="150px" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpPostId_SelectedIndexChanged"></f:DropDownList>
+                        <f:DropDownList ID="drpPostId" runat="server" Label="工种" LabelWidth="150px" LabelAlign="Right" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpPostId_SelectedIndexChanged"></f:DropDownList>
                         <f:TextBox ID="txtPersonName" runat="server" Label="姓名" MaxLength="50" LabelWidth="150px" LabelAlign="Right"></f:TextBox>
                     </Items>
                 </f:FormRow>
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs
index 292b42e1..44f2ae91 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL(ds.Tables[0], 10);
+                AddDatasetToSQL(ds.Tables[0], 14);
                 hdCheckResult.Text = "1";
             }
             catch (Exception exc)
@@ -173,6 +173,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var cns = from x in Funs.DB.Base_CNProfessional select x;
 
+                var unitWorks = from x in Funs.DB.WBS_UnitWork
+                                where x.ProjectId == this.CurrUser.LoginProjectId
+                                && x.SuperUnitWork == null
+                                select x;
+
                 for (int i = 0; i < ir; i++)
                 {
                     string row0 = pds.Rows[i][0].ToString();
@@ -225,42 +230,80 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     string row5 = pds.Rows[i][5].ToString();
                     if (!string.IsNullOrEmpty(row5))
                     {
-                        string[] reunit = row5.Split(',');
-                        foreach (string unit in reunit)
+                        if (row5 != "过程监督不到位" && row5 != "质量缺陷" && row5 != "质量管理问题" && row5 != "不按设计要求施工" && row5 != "不按程序施工" && row5 != "成品保护不到位")
                         {
-                            var u = units.Where(x => x.UnitName == unit).FirstOrDefault();
-                            if (u == null)
-                            {
-                                result += (i + 2).ToString() + "," + "接收单位" + "," + "[" + unit + "]不存在！" + "|";
-                            }
+                            result += (i + 2).ToString() + "," + "问题类别" + "," + "[" + row5 + "]错误！" + "|";
                         }
                     }
 
                     string row7 = pds.Rows[i][7].ToString();
                     if (!string.IsNullOrEmpty(row7))
                     {
-                        try
+                        string[] reunit = row7.Split(',');
+                        foreach (string unitWork in reunit)
                         {
-                            DateTime date = Convert.ToDateTime(row7.Trim());
-                        }
-                        catch (Exception)
-                        {
-                            result += (i + 2).ToString() + "," + "要求封闭日期" + "," + "[" + row7 + "]错误！" + "|";
+                            var u = unitWorks.Where(x => x.UnitWorkName == unitWork.Trim()).FirstOrDefault();
+                            if (u == null)
+                            {
+                                result += (i + 2).ToString() + "," + "单位工程名称" + "," + "[" + unitWork.Trim() + "]不存在！" + "|";
+                            }
                         }
                     }
 
                     string row8 = pds.Rows[i][8].ToString();
                     if (!string.IsNullOrEmpty(row8))
+                    {
+                        string[] reunit = row8.Split(',');
+                        foreach (string unit in reunit)
+                        {
+                            var u = units.Where(x => x.UnitName == unit.Trim()).FirstOrDefault();
+                            if (u == null)
+                            {
+                                result += (i + 2).ToString() + "," + "接收单位" + "," + "[" + unit.Trim() + "]不存在！" + "|";
+                            }
+                        }
+                    }
+
+                    string row9 = pds.Rows[i][9].ToString().Trim();
+                    if (!string.IsNullOrEmpty(row9))
+                    {
+                        if (row9 != "整改中" && row9 != "已闭合")
+                        {
+                            result += (i + 2).ToString() + "," + "实施状态" + "," + "[" + row9 + "]错误！" + "|";
+                        }
+                    }
+
+                    string row11 = pds.Rows[i][11].ToString();
+                    if (!string.IsNullOrEmpty(row11))
                     {
                         try
                         {
-                            DateTime date = Convert.ToDateTime(row8.Trim());
+                            DateTime date = Convert.ToDateTime(row11.Trim());
                         }
                         catch (Exception)
                         {
-                            result += (i + 2).ToString() + "," + "完成日期" + "," + "[" + row8 + "]错误！" + "|";
+                            result += (i + 2).ToString() + "," + "要求封闭日期" + "," + "[" + row11 + "]错误！" + "|";
                         }
                     }
+
+                    string row12 = pds.Rows[i][12].ToString();
+                    if (!string.IsNullOrEmpty(row12))
+                    {
+                        try
+                        {
+                            DateTime date = Convert.ToDateTime(row12.Trim());
+                        }
+                        catch (Exception)
+                        {
+                            result += (i + 2).ToString() + "," + "完成日期" + "," + "[" + row12 + "]错误！" + "|";
+                        }
+                    }
+
+                    string row13 = pds.Rows[i][13].ToString();
+                    if (string.IsNullOrEmpty(row13))
+                    {
+                        result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|";
+                    }
                 }
                 if (!string.IsNullOrEmpty(result))
                 {
@@ -366,7 +409,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL2(ds.Tables[0], 10);
+                AddDatasetToSQL2(ds.Tables[0], 14);
             }
             catch (Exception ex)
             {
@@ -405,13 +448,18 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var cns = from x in Funs.DB.Base_CNProfessional select x;
 
+                var unitWorks = from x in Funs.DB.WBS_UnitWork
+                                where x.ProjectId == this.CurrUser.LoginProjectId
+                                && x.SuperUnitWork == null
+                                select x;
+
                 for (int i = 0; i < ir; i++)
                 {
                     Model.Comprehensive_NCRManagement oldViewInfo = new Model.Comprehensive_NCRManagement();
                     string row0 = pds.Rows[i][0].ToString().Trim();
                     string row1 = pds.Rows[i][1].ToString().Trim();
                     var cn = cns.Where(y => y.ProfessionalName == row1).FirstOrDefault();
-                    oldViewInfo = oldViewInfos.Where(x => x.NCRCode == pds.Rows[i][2].ToString().Trim()
+                    oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][13].ToString().Trim()
                                                          ).FirstOrDefault();
                     if (oldViewInfo == null)
                     {
@@ -426,20 +474,28 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                         {
                             des.IssuedDate = Convert.ToDateTime(pds.Rows[i][4].ToString().Trim());
                         }
-                        if (!string.IsNullOrEmpty(pds.Rows[i][5].ToString().Trim()))
-                        {
-                            des.ReceiveUnit = BLL.UnitService.GetUnitIds(pds.Rows[i][5].ToString().Trim());
-                        }
-                        des.ImplementationFrontState = pds.Rows[i][6].ToString().Trim();
+                        des.Problem = pds.Rows[i][5].ToString().Trim();
+                        des.Measure = pds.Rows[i][6].ToString().Trim();
                         if (!string.IsNullOrEmpty(pds.Rows[i][7].ToString().Trim()))
                         {
-                            des.ClosedDate = Convert.ToDateTime(pds.Rows[i][7].ToString().Trim());
+                            des.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][7].ToString().Trim());
                         }
                         if (!string.IsNullOrEmpty(pds.Rows[i][8].ToString().Trim()))
                         {
-                            des.CompleteDate = Convert.ToDateTime(pds.Rows[i][8].ToString().Trim());
+                            des.ReceiveUnit = BLL.UnitService.GetUnitIds(pds.Rows[i][8].ToString().Trim());
                         }
-                        des.ResponsibleMan = pds.Rows[i][9].ToString().Trim();
+
+                        des.ImplementationFrontState = pds.Rows[i][9].ToString().Trim();
+                        des.ResponsibleMan = pds.Rows[i][10].ToString().Trim();
+                        if (!string.IsNullOrEmpty(pds.Rows[i][11].ToString().Trim()))
+                        {
+                            des.ClosedDate = Convert.ToDateTime(pds.Rows[i][11].ToString().Trim());
+                        }
+                        if (!string.IsNullOrEmpty(pds.Rows[i][12].ToString().Trim()))
+                        {
+                            des.CompleteDate = Convert.ToDateTime(pds.Rows[i][12].ToString().Trim());
+                        }
+                        des.RemarkCode = pds.Rows[i][13].ToString().Trim();
                         BLL.NCRManagementService.AddNCRManagement(des);
                     }
                 }
@@ -454,7 +510,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         #endregion
         #endregion
 
-
         #region 下载模板
         /// <summary>
         /// 下载模板按钮
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx
index 653c6db2..bd1f658c 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx
@@ -35,7 +35,7 @@
 
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="ddlProblem" runat="server" Label="问题类别" Required="true"  LabelAlign="Right" LabelWidth="130px">     
+                        <f:DropDownList ID="ddlProblem" runat="server" Label="问题类别"  LabelAlign="Right" LabelWidth="130px">     
                             <f:ListItem Value="" Text="-请选择-" Selected="true" />
                             <f:ListItem Value="过程监督不到位" Text="过程监督不到位" />
                              <f:ListItem Value="质量缺陷" Text="质量缺陷" />
@@ -88,7 +88,7 @@
                     <Items>
                         <f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
                             <Items>
-                                <f:Label ID="Label1" ShowRedStar="true" runat="server" Label="上传附件"
+                                <f:Label ID="Label1" runat="server" Label="上传附件"
                                     LabelAlign="Right" LabelWidth="130px">
                                 </f:Label>
                                 <f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs
index 0b4321f5..3ffaff70 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs
@@ -275,12 +275,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     nCRManagement.NCRManagementId = SQLHelper.GetNewID(typeof(Model.Comprehensive_NCRManagement));
                     this.hdAttachUrl.Text = nCRManagement.NCRManagementId;
                 }
-                var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == nCRManagement.NCRManagementId);
-                if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
-                {
-                    Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
-                    return;
-                }
+                //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == nCRManagement.NCRManagementId);
+                //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
+                //{
+                //    Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
+                //    return;
+                //}
                 nCRManagement.CompileMan = this.CurrUser.UserId;
                 nCRManagement.Status = BLL.Const.Comprehensive_Compile;
                 BLL.NCRManagementService.AddNCRManagement(nCRManagement);
@@ -288,12 +288,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             else
             {
                 nCRManagement.NCRManagementId = this.NCRManagementId;
-                var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.NCRManagementId);
-                if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
-                {
-                    Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
-                    return;
-                }
+                //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.NCRManagementId);
+                //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
+                //{
+                //    Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
+                //    return;
+                //}
                 var model = Funs.DB.Comprehensive_NCRManagement.Where(u => u.NCRManagementId == this.NCRManagementId).FirstOrDefault();
                 if (model != null)
                 {
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx
index a08d66b8..5c5f0f85 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx
@@ -48,6 +48,9 @@
                         <f:RenderField ColumnID="SpecialEquipmentName" DataField="SpecialEquipmentName" FieldType="String" HeaderText="设备名称" TextAlign="Center"
                             HeaderTextAlign="Center" Width="200px">
                         </f:RenderField>
+                        <f:RenderField ColumnID="PositionNum" DataField="PositionNum" FieldType="String" HeaderText="位号" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="200px">
+                        </f:RenderField>
                         <f:RenderField ColumnID="SunNumber" DataField="SunNumber" FieldType="String" HeaderText="总数量" TextAlign="Center"
                             HeaderTextAlign="Center" Width="160px">
                         </f:RenderField>
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs
index 81356dcf..03e0f526 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs
@@ -32,7 +32,7 @@ namespace FineUIPro.Web.Comprehensive
         public void BindGrid()
         {
             string strSql = @"select C.SpecialEquipmentId, ProjectId,C.EquipmentId, SunNumber, Status,
-                              InformNumber, SubmitDataNumber, MonitoringReportNumber, CompileMan,U.UnitName,eq.SpecialEquipmentName    
+                              InformNumber, SubmitDataNumber, MonitoringReportNumber, CompileMan,U.UnitName,eq.SpecialEquipmentName,PositionNum    
                               from Comprehensive_SpecialEquipment C 
                               left join Base_Unit U on C.UnitId=U.UnitId
 							  left join Base_SpecialEquipment eq on eq.SpecialEquipmentId = C.EquipmentId
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx
index 115203ae..318daf38 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx
@@ -33,6 +33,7 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
+                        <f:TextBox ID="txtPositionNum" runat="server" Label="位号" LabelWidth="130px" LabelAlign="Right"></f:TextBox>
                         <f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
                             <Items>
                                 <f:Label ID="Label1" runat="server" Label="上传附件"
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs
index 3eb296ea..7e3bf8a0 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs
@@ -57,6 +57,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     {
                         this.drpEquipmentId.SelectedValue = specialEquipment.EquipmentId;
                     }
+                    this.txtPositionNum.Text = specialEquipment.PositionNum;
                     this.txtInformNumber.Text = specialEquipment.InformNumber.HasValue ? specialEquipment.InformNumber.ToString() : "";
                     this.txtMonitoringReportNumber.Text = specialEquipment.MonitoringReportNumber.HasValue ? specialEquipment.MonitoringReportNumber.ToString() : "";
                     this.txtSubmitDataNumber.Text = specialEquipment.SubmitDataNumber.HasValue ? specialEquipment.SubmitDataNumber.ToString() : "";
@@ -121,6 +122,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             this.txtSunNumber.Readonly = true;
             this.drpEquipmentId.Readonly = true;
             this.drpUnit.Readonly = true;
+            this.txtPositionNum.Readonly = true;
 
             this.drpAudit.Readonly = true;
 
@@ -199,6 +201,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             {
                 specialEquipment.ReportTime = Convert.ToDateTime(this.txtReportTime.Text);
             }
+            specialEquipment.PositionNum = this.txtPositionNum.Text.Trim();
 
             if (string.IsNullOrEmpty(this.SpecialEquipmentId))
             {
@@ -273,6 +276,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             {
                 specialEquipment.ReportTime = Convert.ToDateTime(this.txtReportTime.Text);
             }
+            specialEquipment.PositionNum = this.txtPositionNum.Text.Trim();
             if (string.IsNullOrEmpty(this.SpecialEquipmentId))
             {
                 if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.designer.cs
index 3e34b1c5..511ab4a8 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.designer.cs
@@ -7,13 +7,11 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.CQMS.Comprehensive
-{
-
-
-    public partial class SpecialEquipmentEdit
-    {
-
+namespace FineUIPro.Web.CQMS.Comprehensive {
+    
+    
+    public partial class SpecialEquipmentEdit {
+        
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+        
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-
+        
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-
+        
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-
+        
         /// <summary>
         /// drpEquipmentId 控件。
         /// </summary>
@@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpEquipmentId;
-
+        
         /// <summary>
         /// txtSunNumber 控件。
         /// </summary>
@@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtSunNumber;
-
+        
         /// <summary>
         /// txtInformNumber 控件。
         /// </summary>
@@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtInformNumber;
-
+        
         /// <summary>
         /// txtSubmitDataNumber 控件。
         /// </summary>
@@ -85,7 +83,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtSubmitDataNumber;
-
+        
         /// <summary>
         /// txtMonitoringReportNumber 控件。
         /// </summary>
@@ -94,7 +92,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtMonitoringReportNumber;
-
+        
+        /// <summary>
+        /// txtPositionNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPositionNum;
+        
         /// <summary>
         /// Panel2 控件。
         /// </summary>
@@ -103,7 +110,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel2;
-
+        
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -112,7 +119,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label1;
-
+        
         /// <summary>
         /// btnAttach 控件。
         /// </summary>
@@ -121,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAttach;
-
+        
         /// <summary>
         /// drpAudit 控件。
         /// </summary>
@@ -130,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpAudit;
-
+        
         /// <summary>
         /// txtReportTime 控件。
         /// </summary>
@@ -139,7 +146,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtReportTime;
-
+        
         /// <summary>
         /// agree 控件。
         /// </summary>
@@ -148,7 +155,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.FormRow agree;
-
+        
         /// <summary>
         /// rblIsAgree 控件。
         /// </summary>
@@ -157,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rblIsAgree;
-
+        
         /// <summary>
         /// options 控件。
         /// </summary>
@@ -166,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.FormRow options;
-
+        
         /// <summary>
         /// txtidea 控件。
         /// </summary>
@@ -175,7 +182,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtidea;
-
+        
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -184,7 +191,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-
+        
         /// <summary>
         /// hdAttachUrl 控件。
         /// </summary>
@@ -193,7 +200,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdAttachUrl;
-
+        
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -202,7 +209,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-
+        
         /// <summary>
         /// btnSubmit 控件。
         /// </summary>
@@ -211,7 +218,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSubmit;
-
+        
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/DataShow/GJSX.aspx b/SGGL/FineUIPro.Web/DataShow/GJSX.aspx
new file mode 100644
index 00000000..f2e79433
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/GJSX.aspx
@@ -0,0 +1,116 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="GJSX.aspx.cs" Inherits="FineUIPro.Web.DataShow.GJSX" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>关键事项数据</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="关键事项数据" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
+                    SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
+                                </f:DropDownList>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="提出日期" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                 <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>                         
+                     <f:TemplateField ColumnID="Count1" Width="120px" HeaderText="数量" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label2" runat="server" Text='<%# Count1(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                    </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: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="1200px" Height="620px"  Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_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 closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/GJSX.aspx.cs b/SGGL/FineUIPro.Web/DataShow/GJSX.aspx.cs
new file mode 100644
index 00000000..6cb52bff
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/GJSX.aspx.cs
@@ -0,0 +1,234 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class GJSX : PageBase
+    {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+                this.Panel1.Title = "关键事项数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            string cpara = string.Empty;
+            if (this.drpProject.SelectedValue != Const._Null)
+            {
+                strSql += " AND projectId = @projectId";  ///状态为已完成
+                listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
+            }
+
+            //if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate >=@StartTime";
+            //    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+
+            //    cpara += " AND c.RegisterDate >=" + this.txtStartTime.Text;
+            //}
+            //if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate <=@EndTime";
+            //    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+
+            //    cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text;
+            //}
+
+            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();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #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 Grid1_Sort(object sender, GridSortEventArgs 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 Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("GJSXItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - ")));
+        }
+        #endregion
+
+
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected int Count1(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var getT = Funs.DB.GJSX.Where(x => x.ProjectId == projectId.ToString());
+                if (datetime1.HasValue)
+                {
+                    getT = getT.Where(x => x.CreateDate >= datetime1);
+                }
+                if (datetime2.HasValue)
+                {
+                    getT = getT.Where(x => x.CreateDate <= datetime2);
+                }
+
+                cout1 = getT.Count();
+            }
+            return cout1;
+        }
+
+        protected int Count2(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true);
+                if (datetime1.HasValue)
+                {
+                    getT = getT.Where(x => x.InspectionDate >= datetime1);
+                }
+                if (datetime2.HasValue)
+                {
+                    getT = getT.Where(x => x.InspectionDate <= datetime2);
+                }
+
+                cout1 = getT.Count();
+            }
+            return cout1;
+        }
+
+        protected string Count4(object projectId)
+        {
+            string rate = string.Empty;
+            if (projectId != null)
+            {
+                var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var getALL = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString());
+
+                if (datetime1.HasValue)
+                {
+                    getALL = getALL.Where(x => x.CheckDate >= datetime1);
+                }
+                if (datetime2.HasValue)
+                {
+                    getALL = getALL.Where(x => x.CheckDate >= datetime1);
+                }
+                var getT = getALL.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true);
+                int coutall = getALL.Count();
+                int cout0 = getT.Count();
+                if (coutall > 0)
+                {
+                    rate = Math.Round(cout0 * 1.0 / coutall * 100, 2).ToString();
+                }
+            }
+            return rate;
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/GJSX.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/GJSX.aspx.designer.cs
new file mode 100644
index 00000000..6624542d
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/GJSX.aspx.designer.cs
@@ -0,0 +1,177 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow {
+    
+    
+    public partial class GJSX {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+        
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+        
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+        
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+        
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+        
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+        
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+        
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+        
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+        
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+        
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+        
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+        
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+        
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx b/SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx
new file mode 100644
index 00000000..f7c82221
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx
@@ -0,0 +1,118 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="GJSXItem.aspx.cs" Inherits="FineUIPro.Web.DataShow.GJSXItem" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>关键事项详细</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="关键事项" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="GJSXID" DataIDField="GJSXID" AllowSorting="true"
+                    SortField="GJSXID" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox ID="txtProject" runat="server" Label="项目" Width="500px" LabelWidth="80px" Readonly="true" LabelAlign="Right">
+                                </f:TextBox>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="45px" HeaderTextAlign="Center"
+                            TextAlign="Center" />
+                        <%--<f:RenderField Width="120px" ColumnID="GJSXID" DataField="GJSXID" SortField="GJSXID"
+                            FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>--%>
+                        <f:RenderField Width="350px" ColumnID="Detail" DataField="Detail" SortField="Detail"
+                            FieldType="String" HeaderText="事项描述" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="QuestionTypeName" DataField="QuestionTypeName" SortField="QuestionTypeName"
+                            FieldType="String" HeaderText="问题类别" HeaderTextAlign="Center" TextAlign="Left"  >
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="unitname" DataField="unitname" 
+                            FieldType="String" HeaderText="责任单位" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="CNProfessionalID" DataField="CNProfessionalID" 
+                            FieldType="String" HeaderText="专业" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:TemplateField ColumnID="Certificate" Width="150px" HeaderText="事项进展情况" HeaderTextAlign="Center" TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label2" runat="server" Text='<%# ConvertProgressDetail(Eval("GJSXID")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                        <f:RenderField Width="90px" ColumnID="State" DataField="State" SortField="State"
+                            FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate"
+                            FieldType="String" HeaderText="提出日期" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="CompleteDate" DataField="CompleteDate" SortField="CompleteDate"
+                            FieldType="String" HeaderText="要求完成日期" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                         <f:RenderField Width="150px" ColumnID="CloseDate" DataField="CloseDate" SortField="CloseDate"
+                            FieldType="String" HeaderText="关闭日期" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        
+                        <f:RenderField Width="150px" ColumnID="User_ReceiveID" DataField="User_ReceiveID" SortField="User_ReceiveID"
+                            FieldType="String" HeaderText="接受人" HeaderTextAlign="Center" TextAlign="Left" >
+                        </f:RenderField>
+                           
+                          <f:RenderField Width="150px" ColumnID="User_Acceptance" DataField="User_Acceptance" 
+                            FieldType="String" HeaderText="验收人" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                         <f:RenderField Width="150px" ColumnID="username" DataField="username" 
+                            FieldType="String" HeaderText="提出人" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                            <f:RenderField Width="150px" ColumnID="AttachUrl" DataField="AttachUrl" 
+                            FieldType="String" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+<%--                        <f:TemplateField ColumnID="Certificate" Width="250px" HeaderText="职业资格证书" HeaderTextAlign="Center" TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label2" runat="server" Text='<%# ConvertCertificateName(Eval("UserId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                        <f:RenderField Width="200px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
+                            FieldType="String" HeaderText="当前所在项目" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="ProjectRoleName" DataField="ProjectRoleName" 
+                            FieldType="String" HeaderText="当前项目角色" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>--%>
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <PageItems>
+                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                        </f:ToolbarSeparator>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+    </form>
+    <script type="text/javascript">
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+         //   F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx.cs
new file mode 100644
index 00000000..6e6d7ba2
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx.cs
@@ -0,0 +1,132 @@
+using Aspose.Words;
+using BLL;
+using Org.BouncyCastle.Asn1.Ocsp;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class GJSXItem : PageBase
+    {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                string projectId = Request.Params["projectId"];
+                this.txtProject.Text = ProjectService.GetProjectNameByProjectId(projectId);
+                Funs.DropDownPageSize(this.ddlPageSize);
+                btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格t
+                BindGrid();
+                this.Panel1.Title = "关键事项数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = "";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));
+
+            listStr.Add(new SqlParameter("@sql_where", strSql));
+
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunProc("Sp_GJSX_getlist", parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            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 TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #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 Grid1_Sort(object sender, GridSortEventArgs 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();
+        }
+        #endregion
+
+        /// <summary>
+        /// 获取检查人名称
+        /// </summary>
+        /// <param name="CarryUnitIds"></param>
+        /// <returns></returns>
+        protected string ConvertCheckMan(object CarryUnitIds)
+        {
+            var uname = BLL.UserService.getUserNamesUserIds(CarryUnitIds);
+            if (string.IsNullOrEmpty(uname))
+            {
+                uname = CarryUnitIds.ToString();
+            }
+            return uname;
+
+        }
+
+        protected string ConvertProgressDetail(object GJSXID)
+        {
+            string detailStr = string.Empty;
+            if (!string.IsNullOrEmpty(GJSXID.ToString()))
+            {
+                Model.GJSX_detail detail = (from x in Funs.DB.GJSX_detail where x.GJSXID == GJSXID.ToString() && x.Progress_detail != null && x.Progress_detail != "" orderby x.Date descending select x).FirstOrDefault();
+                if (detail != null)
+                {
+                    detailStr = detail.Progress_detail;
+                }
+            }
+            return detailStr;
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx.designer.cs
new file mode 100644
index 00000000..7fd82545
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx.designer.cs
@@ -0,0 +1,114 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow {
+    
+    
+    public partial class GJSXItem {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+        
+        /// <summary>
+        /// txtProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProject;
+        
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+        
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+        
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+        
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+        
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx b/SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx
new file mode 100644
index 00000000..e021230d
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx
@@ -0,0 +1,126 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectionManagement.aspx.cs" Inherits="FineUIPro.Web.DataShow.InspectionManagement" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>质量共检数据</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="质量共检数据" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
+                    SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
+                                </f:DropDownList>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="验收日期" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                 <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>                         
+                     <f:TemplateField ColumnID="Count1" Width="120px" HeaderText="共检数量" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label2" runat="server" Text='<%# Count1(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:TemplateField ColumnID="Count2" Width="120px" HeaderText="合格数量" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label1" runat="server" Text='<%# Count2(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:TemplateField ColumnID="Count4" Width="120px" HeaderText="一次共检合格率（%）" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label5" runat="server" Text='<%# Count4(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                    </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: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="1200px" Height="620px"  Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_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 closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.cs b/SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.cs
new file mode 100644
index 00000000..94223888
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.cs
@@ -0,0 +1,234 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class InspectionManagement : PageBase
+    {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+                this.Panel1.Title = "质量共检数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            string cpara = string.Empty;
+            if (this.drpProject.SelectedValue != Const._Null)
+            {
+                strSql += " AND projectId = @projectId";  ///状态为已完成
+                listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
+            }
+
+            //if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate >=@StartTime";
+            //    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+
+            //    cpara += " AND c.RegisterDate >=" + this.txtStartTime.Text;
+            //}
+            //if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate <=@EndTime";
+            //    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+
+            //    cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text;
+            //}
+
+            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();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #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 Grid1_Sort(object sender, GridSortEventArgs 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 Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectionManagementItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - ")));
+        }
+        #endregion
+
+
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected int Count1(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString());
+                if (datetime1.HasValue)
+                {
+                    getT = getT.Where(x => x.InspectionDate >= datetime1);
+                }
+                if (datetime2.HasValue)
+                {
+                    getT = getT.Where(x => x.InspectionDate <= datetime2);
+                }
+
+                cout1 = getT.Count();
+            }
+            return cout1;
+        }
+
+        protected int Count2(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true);
+                if (datetime1.HasValue)
+                {
+                    getT = getT.Where(x => x.InspectionDate >= datetime1);
+                }
+                if (datetime2.HasValue)
+                {
+                    getT = getT.Where(x => x.InspectionDate <= datetime2);
+                }
+
+                cout1 = getT.Count();
+            }
+            return cout1;
+        }
+
+        protected string Count4(object projectId)
+        {
+            string rate = string.Empty;
+            if (projectId != null)
+            {
+                var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var getALL = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString());
+
+                if (datetime1.HasValue)
+                {
+                    getALL = getALL.Where(x => x.CheckDate >= datetime1);
+                }
+                if (datetime2.HasValue)
+                {
+                    getALL = getALL.Where(x => x.CheckDate >= datetime1);
+                }
+                var getT = getALL.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true);
+                int coutall = getALL.Count();
+                int cout0 = getT.Count();
+                if (coutall > 0)
+                {
+                    rate = Math.Round(cout0 * 1.0 / coutall * 100, 2).ToString();
+                }
+            }
+            return rate;
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.designer.cs
new file mode 100644
index 00000000..d8bd60a2
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.designer.cs
@@ -0,0 +1,195 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow {
+    
+    
+    public partial class InspectionManagement {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+        
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+        
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+        
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+        
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+        
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+        
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+        
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+        
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+        
+        /// <summary>
+        /// Label5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label5;
+        
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+        
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+        
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+        
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+        
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+        
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx b/SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx
new file mode 100644
index 00000000..34b3a5d4
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx
@@ -0,0 +1,108 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectionManagementItem.aspx.cs" Inherits="FineUIPro.Web.DataShow.InspectionManagementItem" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>质量共检详细</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="质量共检" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="InspectionId" DataIDField="InspectionId" AllowSorting="true"
+                    SortField="NoticeCode" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox ID="txtProject" runat="server" Label="项目" Width="500px" LabelWidth="80px" Readonly="true" LabelAlign="Right">
+                                </f:TextBox>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="验收日期" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose">
+                                </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="UnitName3" DataField="UnitName" FieldType="String" HeaderText="施工分包商" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="260px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="110px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="NoticeCode" DataField="NoticeCode" FieldType="String" HeaderText="共检通知单编号" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="130px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="AcceptanceSite" DataField="AcceptanceSite" FieldType="String" HeaderText="验收部位" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="150px">
+                        </f:RenderField>
+                       <%-- <f:RenderField ColumnID="AcceptanceCheckMan" DataField="AcceptanceCheckMan" FieldType="String" HeaderText="检查人" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>--%>
+                        <f:TemplateField ColumnID="AcceptanceCheckMan" Width="280px" HeaderText="检查人" HeaderTextAlign="Center" TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="Label1" runat="server" Text='<%# ConvertCheckMan(Eval("AcceptanceCheckMan")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField ColumnID="IsOnceQualified" DataField="IsOnceQualified" FieldType="String" HeaderText="是否一次合格" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="InspectionCode" DataField="InspectionCode" FieldType="String" HeaderText="报检编号" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="InspectionDate" DataField="InspectionDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="验收日期" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
+                            <ItemTemplate>
+                                <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" 
+                                                 Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("InspectionId")+"R") %>'   ToolTip="附件查看"></asp:LinkButton>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                    </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:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+    </form>
+    <script type="text/javascript">
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+         //   F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx.cs
new file mode 100644
index 00000000..d4e89de6
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx.cs
@@ -0,0 +1,143 @@
+using Aspose.Words;
+using BLL;
+using Org.BouncyCastle.Asn1.Ocsp;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class InspectionManagementItem : PageBase
+    {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                string projectId = Request.Params["projectId"];
+                this.txtProject.Text = ProjectService.GetProjectNameByProjectId(projectId);
+                Funs.DropDownPageSize(this.ddlPageSize);
+                btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格t
+                BindGrid();
+                this.Panel1.Title = "质量共检数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"SELECT distinct P.InspectionId, 
+                                    P.ProjectId,
+                                    P.UnitId,
+                                    P.CNProfessionalId,
+                                    P.UnitWorkId,
+                                    U.UnitName,
+                                    C.ProfessionalName,
+                                    P.NoticeCode,
+                                    UnitWork.UnitWorkName,
+                                    DP.DivisionName AS Branch,
+                                    BP.BreakdownName AS ControlPointType,
+                                    BP.Class,
+                                    P.AcceptanceSite,
+                                    P.AcceptanceCheckMan,
+                                    (CASE WHEN IsOnceQualified='True' THEN '是' ELSE '否' END)AS IsOnceQualified,
+                                    P.InspectionCode,
+                                    P.InspectionDate"
+                            + @" FROM ProcessControl_InspectionManagementDetail AS D"
+                            + @" LEFT JOIN ProcessControl_InspectionManagement AS P on P.InspectionId=D.InspectionId"
+                            + @" LEFT JOIN Base_Unit AS U ON U.UnitId = P.UnitId"
+                            + @" LEFT JOIN Base_CNProfessional C ON C.CNProfessionalId = P.CNProfessionalId"
+                            + @" LEFT JOIN WBS_UnitWork AS UnitWork ON UnitWork.UnitWorkId = P.UnitWorkId"
+                            + @" LEFT JOIN WBS_DivisionProject AS DP ON DP.DivisionProjectId = P.Branch"
+                            + @" LEFT JOIN WBS_BreakdownProject AS BP ON BP.BreakdownProjectId = P.ControlPointType"
+                            + @" WHERE P.ProjectId=@ProjectId  ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));
+
+            strSql += " AND (P.InspectionDate>=@startTime or @startTime='') and (P.InspectionDate<=@endTime or @endTime='') ";
+            listStr.Add(new SqlParameter("@startTime", !string.IsNullOrEmpty(txtStartTime.Text.Trim()) ? txtStartTime.Text.Trim() + " 00:00:00" : ""));
+            listStr.Add(new SqlParameter("@endTime", !string.IsNullOrEmpty(txtEndTime.Text.Trim()) ? txtEndTime.Text.Trim() + "  23:59:59" : ""));
+            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();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #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 Grid1_Sort(object sender, GridSortEventArgs 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();
+        }
+        #endregion
+      
+        /// <summary>
+        /// 获取检查人名称
+        /// </summary>
+        /// <param name="CarryUnitIds"></param>
+        /// <returns></returns>
+        protected string ConvertCheckMan(object CarryUnitIds)
+        {
+            var uname = BLL.UserService.getUserNamesUserIds(CarryUnitIds);
+            if (string.IsNullOrEmpty(uname))
+            {
+                uname = CarryUnitIds.ToString();
+            }
+            return uname;
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx.designer.cs
new file mode 100644
index 00000000..9a2c6254
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx.designer.cs
@@ -0,0 +1,159 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow {
+    
+    
+    public partial class InspectionManagementItem {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+        
+        /// <summary>
+        /// txtProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProject;
+        
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+        
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+        
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+        
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+        
+        /// <summary>
+        /// lblPageIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+        
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+        
+        /// <summary>
+        /// lbtnFileUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
+        
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+        
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+        
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx b/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx
new file mode 100644
index 00000000..33747fec
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx
@@ -0,0 +1,145 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeldOneOK.aspx.cs" Inherits="FineUIPro.Web.DataShow.WeldOneOK" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>焊接一次合格率</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊接一次合格率" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
+                    SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
+                                </f:DropDownList>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:GroupField HeaderText="工艺管道" TextAlign="Center">
+                            <Columns>
+                                <f:TemplateField ColumnID="Count1" Width="100px" HeaderText="累计拍片数量" HeaderTextAlign="Center" TextAlign="Right">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label2" runat="server" Text='<%# Count1(Eval("ProjectId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField ColumnID="Count2" Width="140px" HeaderText="累计一次合格率（%）" HeaderTextAlign="Center" TextAlign="Right">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label5" runat="server" Text='<%# Count2(Eval("ProjectId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:GroupField HeaderText="地管" TextAlign="Center">
+                            <Columns>
+                                <f:TemplateField ColumnID="Count3" Width="100px" HeaderText="累计拍片数量" HeaderTextAlign="Center" TextAlign="Right">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label1" runat="server" Text='<%# Count3(Eval("ProjectId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField ColumnID="Count4" Width="140px" HeaderText="累计一次合格率（%）" HeaderTextAlign="Center" TextAlign="Right">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label3" runat="server" Text='<%# Count4(Eval("ProjectId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:GroupField HeaderText="非标" TextAlign="Center">
+                            <Columns>
+                                <f:TemplateField ColumnID="Count5" Width="100px" HeaderText="累计拍片数量" HeaderTextAlign="Center" TextAlign="Right">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label4" runat="server" Text='<%# Count5(Eval("ProjectId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField ColumnID="Count6" Width="140px" HeaderText="累计一次合格率（%）" HeaderTextAlign="Center" TextAlign="Right">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label6" runat="server" Text='<%# Count6(Eval("ProjectId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                            </Columns>
+                        </f:GroupField>
+                    </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: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="1200px" Height="620px" Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_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 closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.cs b/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.cs
new file mode 100644
index 00000000..48736729
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.cs
@@ -0,0 +1,274 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class WeldOneOK : PageBase
+    {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+                this.Panel1.Title = "焊接一次合格数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            string cpara = string.Empty;
+            if (this.drpProject.SelectedValue != Const._Null)
+            {
+                strSql += " AND projectId = @projectId";  ///状态为已完成
+                listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
+            }
+
+            //if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate >=@StartTime";
+            //    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+
+            //    cpara += " AND c.RegisterDate >=" + this.txtStartTime.Text;
+            //}
+            //if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate <=@EndTime";
+            //    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+
+            //    cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text;
+            //}
+
+            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();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #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 Grid1_Sort(object sender, GridSortEventArgs 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 Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WeldOneOKItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - ")));
+        }
+        #endregion
+
+
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected int? Count1(object projectId)
+        {
+            int? cout1 = null;
+            if (projectId != null)
+            {
+                var getT = (from x in Funs.DB.ProcessControl_NondestructiveTest_New
+                            where x.ProfessionalName == "工艺管道" && x.ProjectId == projectId.ToString()
+                            orderby x.CreateDate descending
+                            select x).FirstOrDefault();
+                if (getT != null && getT.TotalQuantity != null)
+                {
+                    cout1 = getT.TotalQuantity.Value;
+                }
+            }
+            return cout1;
+        }
+
+        protected string Count2(object projectId)
+        {
+            string cout1 = null;
+            if (projectId != null)
+            {
+                var getT = (from x in Funs.DB.ProcessControl_NondestructiveTest_New
+                            where x.ProfessionalName == "工艺管道" && x.ProjectId == projectId.ToString()
+                            orderby x.CreateDate descending
+                            select x).FirstOrDefault();
+                if (getT != null)
+                {
+                    cout1 = getT.TotalRate;
+                }
+            }
+            return cout1;
+        }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected int? Count3(object projectId)
+        {
+            int? cout1 = null;
+            if (projectId != null)
+            {
+                var getT = (from x in Funs.DB.ProcessControl_NondestructiveTest_New
+                            where x.ProfessionalName == "地管" && x.ProjectId == projectId.ToString()
+                            orderby x.CreateDate descending
+                            select x).FirstOrDefault();
+                if (getT != null && getT.TotalQuantity != null)
+                {
+                    cout1 = getT.TotalQuantity.Value;
+                }
+            }
+            return cout1;
+        }
+
+        protected string Count4(object projectId)
+        {
+            string cout1 = null;
+            if (projectId != null)
+            {
+                var getT = (from x in Funs.DB.ProcessControl_NondestructiveTest_New
+                            where x.ProfessionalName == "地管" && x.ProjectId == projectId.ToString()
+                            orderby x.CreateDate descending
+                            select x).FirstOrDefault();
+                if (getT != null)
+                {
+                    cout1 = getT.TotalRate;
+                }
+            }
+            return cout1;
+        }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected int? Count5(object projectId)
+        {
+            int? cout1 = null;
+            if (projectId != null)
+            {
+                var getT = (from x in Funs.DB.ProcessControl_NondestructiveTest_New
+                            where x.ProfessionalName == "非标" && x.ProjectId == projectId.ToString()
+                            orderby x.CreateDate descending
+                            select x).FirstOrDefault();
+                if (getT != null && getT.TotalQuantity != null)
+                {
+                    cout1 = getT.TotalQuantity.Value;
+                }
+            }
+            return cout1;
+        }
+
+        protected string Count6(object projectId)
+        {
+            string cout1 = null;
+            if (projectId != null)
+            {
+                var getT = (from x in Funs.DB.ProcessControl_NondestructiveTest_New
+                            where x.ProfessionalName == "非标" && x.ProjectId == projectId.ToString()
+                            orderby x.CreateDate descending
+                            select x).FirstOrDefault();
+                if (getT != null)
+                {
+                    cout1 = getT.TotalRate;
+                }
+            }
+            return cout1;
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.designer.cs
new file mode 100644
index 00000000..83484e97
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.designer.cs
@@ -0,0 +1,195 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow {
+    
+    
+    public partial class WeldOneOK {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+        
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+        
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+        
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+        
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+        
+        /// <summary>
+        /// Label5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label5;
+        
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+        
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label3;
+        
+        /// <summary>
+        /// Label4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label4;
+        
+        /// <summary>
+        /// Label6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label6;
+        
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+        
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+        
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+        
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+        
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+        
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/WeldOneOKItem.aspx b/SGGL/FineUIPro.Web/DataShow/WeldOneOKItem.aspx
new file mode 100644
index 00000000..e3f3b440
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/WeldOneOKItem.aspx
@@ -0,0 +1,101 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeldOneOKItem.aspx.cs" Inherits="FineUIPro.Web.DataShow.WeldOneOKItem" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>焊接一次合格率详细</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊接一次合格率" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="Id" DataIDField="Id" AllowSorting="true"
+                    SortField="CreateDate" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox ID="txtProject" runat="server" Label="项目" Width="500px" LabelWidth="80px" Readonly="true" LabelAlign="Right">
+                                </f:TextBox>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="日期" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose">
+                                </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="UnitName" DataField="UnitName" FieldType="String" HeaderText="施工单位" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="320px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="160px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="MonthQuantity" DataField="MonthQuantity" FieldType="String" HeaderText="本月拍片数量" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="160px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="TotalQuantity" DataField="TotalQuantity" FieldType="String" HeaderText="累计拍片数量" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="160px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="MonthRate" DataField="MonthRate" FieldType="String" HeaderText="本月一次合格率（%）" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="160px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="TotalRate" DataField="TotalRate" FieldType="String" HeaderText="累计一次合格率（%）" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="160px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="CreateDate" DataField="CreateDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="创建日期" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
+                            <ItemTemplate>
+                                <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" 
+                                                 Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("Id")) %>'   ToolTip="附件查看"></asp:LinkButton>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                    </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:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+    </form>
+    <script type="text/javascript">
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+         //   F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/WeldOneOKItem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/WeldOneOKItem.aspx.cs
new file mode 100644
index 00000000..32166f59
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/WeldOneOKItem.aspx.cs
@@ -0,0 +1,106 @@
+using Aspose.Words;
+using BLL;
+using Org.BouncyCastle.Asn1.Ocsp;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class WeldOneOKItem : PageBase
+    {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                string projectId = Request.Params["projectId"];
+                this.txtProject.Text = ProjectService.GetProjectNameByProjectId(projectId);
+                Funs.DropDownPageSize(this.ddlPageSize);
+                btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格t
+                BindGrid();
+                this.Panel1.Title = "焊接一次合格率数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"SELECT N.*, U.UnitName "
+                            + @" FROM ProcessControl_NondestructiveTest_New AS N"
+                            + @" LEFT JOIN Base_Unit AS U ON U.UnitId = N.UnitId"
+                            + @" WHERE N.ProjectId=@projectId  ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));
+
+            strSql += " AND (N.CreateDate>=@startTime or @startTime='') and (N.CreateDate<=@endTime or @endTime='') ";
+            listStr.Add(new SqlParameter("@startTime", !string.IsNullOrEmpty(txtStartTime.Text.Trim()) ? txtStartTime.Text.Trim() + " 00:00:00" : ""));
+            listStr.Add(new SqlParameter("@endTime", !string.IsNullOrEmpty(txtEndTime.Text.Trim()) ? txtEndTime.Text.Trim() + "  23:59:59" : ""));
+            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();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #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 Grid1_Sort(object sender, GridSortEventArgs 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();
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/WeldOneOKItem.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/WeldOneOKItem.aspx.designer.cs
new file mode 100644
index 00000000..1cfe32c9
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/WeldOneOKItem.aspx.designer.cs
@@ -0,0 +1,150 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow {
+    
+    
+    public partial class WeldOneOKItem {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+        
+        /// <summary>
+        /// txtProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProject;
+        
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+        
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+        
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+        
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+        
+        /// <summary>
+        /// lblPageIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+        
+        /// <summary>
+        /// lbtnFileUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
+        
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+        
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+        
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/File/Excel/CQMS/质量专项检查模版.xlsx b/SGGL/FineUIPro.Web/File/Excel/CQMS/质量专项检查模版.xlsx
new file mode 100644
index 00000000..37d2fbc1
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Excel/CQMS/质量专项检查模版.xlsx differ
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/NCR管理导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/NCR管理导入模板.xls
index 877d056a..3e1ec992 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/NCR管理导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/NCR管理导入模板.xls differ
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/人员报验导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/人员报验导入模板.xls
index 8efe39d5..4fb6a79a 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/人员报验导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/人员报验导入模板.xls differ
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/图纸收发记录导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/图纸收发记录导入模板.xls
index cba4076e..c2cbc441 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/图纸收发记录导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/图纸收发记录导入模板.xls differ
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/机具报验导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/机具报验导入模板.xls
index 5de9aa24..8d33ec9e 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/机具报验导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/机具报验导入模板.xls differ
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/设计变更单导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/设计变更单导入模板.xls
index 7859e742..59a5948c 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/设计变更单导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/设计变更单导入模板.xls differ
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/资料收发文登记记录导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/资料收发文登记记录导入模板.xls
new file mode 100644
index 00000000..ef556487
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Excel/DataIn/资料收发文登记记录导入模板.xls differ
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/资料收发文登记记录导入模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/资料收发文登记记录导入模板.xlsx
deleted file mode 100644
index 9b6ff15a..00000000
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/资料收发文登记记录导入模板.xlsx and /dev/null differ
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index ebc933f7..aa09bb51 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -599,12 +599,16 @@
     <Content Include="DataShow\EduTrain.aspx" />
     <Content Include="DataShow\Emergency.aspx" />
     <Content Include="DataShow\Environmental.aspx" />
+    <Content Include="DataShow\GJSX.aspx" />
+    <Content Include="DataShow\GJSXItem.aspx" />
     <Content Include="DataShow\HiddenRectification.aspx" />
     <Content Include="DataShow\HiddenRectificationItem.aspx" />
     <Content Include="DataShow\HJGLDefect.aspx" />
     <Content Include="DataShow\HJGLWelder.aspx" />
     <Content Include="DataShow\HJGLWelding.aspx" />
     <Content Include="DataShow\HJGLWeldingItem.aspx" />
+    <Content Include="DataShow\InspectionManagement.aspx" />
+    <Content Include="DataShow\InspectionManagementItem.aspx" />
     <Content Include="DataShow\LargeEngineering.aspx" />
     <Content Include="DataShow\LargeEngineeringItem.aspx" />
     <Content Include="DataShow\License.aspx" />
@@ -625,6 +629,8 @@
     <Content Include="DataShow\SecurityCost.aspx" />
     <Content Include="DataShow\SecurityRisk.aspx" />
     <Content Include="DataShow\SecurityRiskItem.aspx" />
+    <Content Include="DataShow\WeldOneOK.aspx" />
+    <Content Include="DataShow\WeldOneOKItem.aspx" />
     <Content Include="DataShow\WorkingHours.aspx" />
     <Content Include="DataShow\WorkingHoursItem.aspx" />
     <Content Include="DigData\HSEDataCollect.aspx" />
@@ -8565,6 +8571,20 @@
     <Compile Include="DataShow\Environmental.aspx.designer.cs">
       <DependentUpon>Environmental.aspx</DependentUpon>
     </Compile>
+    <Compile Include="DataShow\GJSX.aspx.cs">
+      <DependentUpon>GJSX.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\GJSX.aspx.designer.cs">
+      <DependentUpon>GJSX.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\GJSXItem.aspx.cs">
+      <DependentUpon>GJSXItem.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\GJSXItem.aspx.designer.cs">
+      <DependentUpon>GJSXItem.aspx</DependentUpon>
+    </Compile>
     <Compile Include="DataShow\HiddenRectification.aspx.cs">
       <DependentUpon>HiddenRectification.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -8607,6 +8627,20 @@
     <Compile Include="DataShow\HJGLWeldingItem.aspx.designer.cs">
       <DependentUpon>HJGLWeldingItem.aspx</DependentUpon>
     </Compile>
+    <Compile Include="DataShow\InspectionManagement.aspx.cs">
+      <DependentUpon>InspectionManagement.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\InspectionManagement.aspx.designer.cs">
+      <DependentUpon>InspectionManagement.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\InspectionManagementItem.aspx.cs">
+      <DependentUpon>InspectionManagementItem.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\InspectionManagementItem.aspx.designer.cs">
+      <DependentUpon>InspectionManagementItem.aspx</DependentUpon>
+    </Compile>
     <Compile Include="DataShow\LargeEngineering.aspx.cs">
       <DependentUpon>LargeEngineering.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -8747,6 +8781,20 @@
     <Compile Include="DataShow\SecurityRiskItem.aspx.designer.cs">
       <DependentUpon>SecurityRiskItem.aspx</DependentUpon>
     </Compile>
+    <Compile Include="DataShow\WeldOneOK.aspx.cs">
+      <DependentUpon>WeldOneOK.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\WeldOneOK.aspx.designer.cs">
+      <DependentUpon>WeldOneOK.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\WeldOneOKItem.aspx.cs">
+      <DependentUpon>WeldOneOKItem.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\WeldOneOKItem.aspx.designer.cs">
+      <DependentUpon>WeldOneOKItem.aspx</DependentUpon>
+    </Compile>
     <Compile Include="DataShow\WorkingHours.aspx.cs">
       <DependentUpon>WorkingHours.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
index 9e91deff..63ca13cc 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />
diff --git a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx
index facbc433..30300c5a 100644
--- a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx
@@ -17,7 +17,7 @@
                     <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 ID="btnSave" OnClick="btnSave_Click" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1" OnClientClick="if(!isValid()){return false;}">
                         </f:Button>
                     </Items>
                 </f:Toolbar>
@@ -33,7 +33,7 @@
                                 <Rows>
                                     <f:FormRow>
                                         <Items>
-                                            <f:TextBox ID="txtJobNo" runat="server" Label="职工号" LabelAlign="Right" LabelWidth="150px" MaxLength="50" Required="true" ShowRedStar="true">
+                                            <f:TextBox ID="txtJobNo" runat="server" Label="工号" LabelAlign="Right" LabelWidth="150px" MaxLength="50" Required="true" ShowRedStar="true">
                                             </f:TextBox>
                                             <f:DropDownList ID="ddlShiftType" runat="server" Label="轮班类型" LabelAlign="Right" EnableEdit="true" ShowRedStar="true">
                                                 <f:ListItem Text="白班" Value="1" />
@@ -62,72 +62,71 @@
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:CheckBoxList ID="rdbOperation" AutoPostBack="true" OnSelectedIndexChanged="rdbOperation_SelectedIndexChanged"
-                                                Label="选项" ColumnNumber="3" runat="server" ShowRedStar="true" Required="true" DisplayType="Switch" SwitchTextVisible="true">
-                                                <f:CheckItem Text="脱盐水" Value="1" />
-                                                <f:CheckItem Text="循环水" Value="2" />
-                                                <f:CheckItem Text="蒸汽" Value="3" />
-                                                <f:CheckItem Text="空压站" Value="4" />
-                                                <f:CheckItem Text="合成氨" Value="5" />
-                                                <f:CheckItem Text="尿素" Value="6" />
+                                            <f:CheckBoxList ID="rdbOperation" AutoPostBack="true" OnSelectedIndexChanged="rdbOperation_SelectedIndexChanged" DataTextField="Text" DataValueField="Value"
+                                                Label="系统选项" ColumnNumber="3" runat="server" ShowRedStar="true" Required="true" DisplayType="Switch" SwitchTextVisible="true">
                                             </f:CheckBoxList>
                                         </Items>
                                     </f:FormRow>
-                                    <f:FormRow runat="server" ID="tys">
-                                        <Items>
-                                            <f:TextArea ID="txtDesalinatedSituation" runat="server" Label="脱盐水运行情况" LabelAlign="Right" LabelWidth="150px" MaxLength="500" Required="true" ShowRedStar="true">
-                                            </f:TextArea>
-                                            <f:TextArea ID="txtDesalinatedRemarks" runat="server" Label="脱盐水备注" LabelAlign="Right" LabelWidth="150px" MaxLength="500" Required="true" ShowRedStar="true">
-                                            </f:TextArea>
-                                        </Items>
-                                    </f:FormRow>
-                                    <f:FormRow runat="server" ID="xhs">
-                                        <Items>
-
-                                            <f:TextArea ID="txtLoopSituation" runat="server" Label="循环水运行情况" LabelAlign="Right" LabelWidth="150px" MaxLength="500" Required="true" ShowRedStar="true">
-                                            </f:TextArea>
-                                            <f:TextArea ID="txtLoopRemarks" runat="server" Label="循环水备注" LabelAlign="Right" LabelWidth="150px" MaxLength="500" Required="true" ShowRedStar="true">
-                                            </f:TextArea>
-                                        </Items>
-                                    </f:FormRow>
-                                    <f:FormRow runat="server" ID="zq">
-                                        <Items>
-                                            <f:TextArea ID="txtSteamSituation" runat="server" Label="蒸汽运行情况" LabelAlign="Right" LabelWidth="150px" MaxLength="500" Required="true" ShowRedStar="true">
-                                            </f:TextArea>
-                                            <f:TextArea ID="txtSteamRemarks" runat="server" Label="蒸汽备注" LabelAlign="Right" LabelWidth="150px" MaxLength="500" Required="true" ShowRedStar="true">
-                                            </f:TextArea>
-                                        </Items>
-                                    </f:FormRow>
-                                    <f:FormRow runat="server" ID="kyz">
-                                        <Items>
-                                            <f:TextArea ID="txtAirCompressionSituation" runat="server" Label="空压站运行情况" LabelAlign="Right" LabelWidth="150px" MaxLength="500" Required="true" ShowRedStar="true">
-                                            </f:TextArea>
-                                            <f:TextArea ID="txtAirCompressionRemarks" runat="server" Label="空压站备注" LabelAlign="Right" LabelWidth="150px" MaxLength="500" Required="true" ShowRedStar="true">
-                                            </f:TextArea>
-                                        </Items>
-                                    </f:FormRow>
-                                    <f:FormRow runat="server" ID="hca">
-                                        <Items>
-                                            <f:TextArea ID="txtCompoundAmmoniaSituation" runat="server" Label="合成氨运行情况" LabelAlign="Right" LabelWidth="150px" MaxLength="500" Required="true" ShowRedStar="true">
-                                            </f:TextArea>
-                                            <f:TextArea ID="txtCompoundAmmoniaRemarks" runat="server" Label="合成氨备注" LabelAlign="Right" LabelWidth="150px" MaxLength="500" Required="true" ShowRedStar="true">
-                                            </f:TextArea>
-                                        </Items>
-                                    </f:FormRow>
-                                    <f:FormRow runat="server" ID="ns">
-                                        <Items>
-                                            <f:TextArea ID="txtUreaSituation" runat="server" Label="尿素运行情况" LabelAlign="Right" LabelWidth="150px" MaxLength="500" Required="true" ShowRedStar="true">
-                                            </f:TextArea>
-                                            <f:TextArea ID="txtUreaRemarks" runat="server" Label="尿素备注" LabelAlign="Right" LabelWidth="150px" MaxLength="500" Required="true" ShowRedStar="true">
-                                            </f:TextArea>
-                                        </Items>
-                                    </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:TextArea ID="txtHandoverCare" runat="server" Label="交班注意" LabelAlign="Right" LabelWidth="150px" MaxLength="500" Required="true" ShowRedStar="true">
-                                            </f:TextArea>
+                                            <f:ContentPanel ID="ContentPanel4" Title="系统项" ShowBorder="true" BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
+                                                runat="server">
+                                                <f:Form ID="Form5" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+                                                    BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+                                                    <Rows>
+                                                        <f:FormRow>
+                                                            <Items>
+                                                                <f:Grid ID="gvSystemOption" ShowBorder="true" ShowHeader="false" runat="server" Height="400px"
+                                                                    AllowCellEditing="true" ClicksToEdit="1" DataIDField="RunningId" ForceFit="true"
+                                                                    DataKeyNames="RunningId,InstallationId,ProcessesId,SystemId,SystemName" EnableMultiSelect="false" ShowGridHeader="true"
+                                                                    EnableColumnLines="true">
+                                                                    <Columns>
+                                                                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                                            TextAlign="Center" />
+                                                                        <f:RenderField Width="150px" ColumnID="SystemName" DataField="SystemName" HeaderText="系统名称"
+                                                                            HeaderTextAlign="Center" TextAlign="Left">
+                                                                        </f:RenderField>
+                                                                        <f:RenderField Width="300px" ColumnID="Situation" DataField="Situation" FieldType="String"
+                                                                            HeaderText="运行情况" HeaderTextAlign="Center" TextAlign="Left">
+                                                                            <Editor>
+                                                                                <f:TextArea runat="server" ID="txtSituation"></f:TextArea>
+                                                                            </Editor>
+                                                                        </f:RenderField>
+                                                                        <f:RenderField Width="300px" ColumnID="Remarks" DataField="Remarks" FieldType="String"
+                                                                            HeaderText="备注" HeaderTextAlign="Center" TextAlign="Left">
+                                                                            <Editor>
+                                                                                <f:TextArea runat="server" ID="txtRemarks"></f:TextArea>
+                                                                            </Editor>
+                                                                        </f:RenderField>
+                                                                    </Columns>
+                                                                </f:Grid>
+                                                            </Items>
+                                                        </f:FormRow>
+                                                    </Rows>
+                                                </f:Form>
+                                            </f:ContentPanel>
                                         </Items>
                                     </f:FormRow>
+
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:ContentPanel ID="ContentPanel5" Title="交班注意" ShowBorder="true" BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
+                                                runat="server">
+                                                <f:Form ID="Form6" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+                                                    BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+                                                    <Rows>
+                                                        <f:FormRow>
+                                                            <Items>
+                                                                <f:TextArea ID="txtHandoverCare" runat="server" LabelAlign="Right" LabelWidth="150px" MaxLength="500" Required="true" ShowRedStar="true">
+                                                                </f:TextArea>
+                                                            </Items>
+                                                        </f:FormRow>
+                                                    </Rows>
+                                                </f:Form>
+                                            </f:ContentPanel>
+                                        </Items>
+                                    </f:FormRow>
+
                                     <f:FormRow>
                                         <Items>
                                             <f:ContentPanel ID="ContentPanel1" Title="操作问题" ShowBorder="true" BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
@@ -137,14 +136,36 @@
                                                     <Rows>
                                                         <f:FormRow>
                                                             <Items>
-                                                                <f:TextArea ID="txtOperationReason" runat="server" Label="操作问题原因" LabelAlign="Right" LabelWidth="150px" MaxLength="500" Required="true" ShowRedStar="true">
-                                                                </f:TextArea>
-                                                            </Items>
-                                                        </f:FormRow>
-                                                        <f:FormRow>
-                                                            <Items>
-                                                                <f:TextArea ID="txtOperationHandle" runat="server" Label="操作问题处理" LabelAlign="Right" LabelWidth="150px" MaxLength="500" Required="true" ShowRedStar="true">
-                                                                </f:TextArea>
+                                                                <f:Grid ID="gvOperation" ShowBorder="true" ShowHeader="false" runat="server" Height="400px"
+                                                                    AllowCellEditing="true" ClicksToEdit="1" DataIDField="OperationId" ForceFit="true"
+                                                                    DataKeyNames="OperationId,RunningId,InstallationId,ProcessesId,SystemId" EnableMultiSelect="false" ShowGridHeader="true"
+                                                                    EnableColumnLines="true" OnRowCommand="gvOperation_RowCommand">
+                                                                    <Toolbars>
+                                                                        <f:Toolbar ID="Toolbar2" runat="server">
+                                                                            <Items>
+                                                                                <f:Button ID="btnOperationAdd" Text="新增" Icon="Add" runat="server" OnClick="btnOperationAdd_Click"></f:Button>
+                                                                            </Items>
+                                                                        </f:Toolbar>
+                                                                    </Toolbars>
+                                                                    <Columns>
+                                                                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                                            TextAlign="Center" />
+                                                                        <f:RenderField Width="300px" ColumnID="OperationReason" DataField="OperationReason" FieldType="String"
+                                                                            HeaderText="操作问题原因" HeaderTextAlign="Center" TextAlign="Left">
+                                                                            <Editor>
+                                                                                <f:TextArea runat="server" ID="txtOperationReason"></f:TextArea>
+                                                                            </Editor>
+                                                                        </f:RenderField>
+                                                                        <f:RenderField Width="300px" ColumnID="OperationHandle" DataField="OperationHandle" FieldType="String"
+                                                                            HeaderText="操作问题处理" HeaderTextAlign="Center" TextAlign="Left">
+                                                                            <Editor>
+                                                                                <f:TextArea runat="server" ID="txtOperationHandle"></f:TextArea>
+                                                                            </Editor>
+                                                                        </f:RenderField>
+                                                                        <f:LinkButtonField Width="100px" ConfirmText="是否确认删除当前选中数据？" ConfirmTarget="Top"
+                                                                            CommandName="Delete" Icon="Delete" />
+                                                                    </Columns>
+                                                                </f:Grid>
                                                             </Items>
                                                         </f:FormRow>
                                                     </Rows>
@@ -161,14 +182,36 @@
                                                     <Rows>
                                                         <f:FormRow>
                                                             <Items>
-                                                                <f:TextArea ID="txtMaintenanceReason" runat="server" Label="维护问题原因" LabelAlign="Right" LabelWidth="150px" MaxLength="500" Required="true" ShowRedStar="true">
-                                                                </f:TextArea>
-                                                            </Items>
-                                                        </f:FormRow>
-                                                        <f:FormRow>
-                                                            <Items>
-                                                                <f:TextArea ID="txtMaintenanceHandle" runat="server" Label="维护问题处理" LabelAlign="Right" LabelWidth="150px" MaxLength="500" Required="true" ShowRedStar="true">
-                                                                </f:TextArea>
+                                                                <f:Grid ID="gvMaintenance" ShowBorder="true" ShowHeader="false" runat="server" Height="400px"
+                                                                    AllowCellEditing="true" ClicksToEdit="1" DataIDField="MaintenanceId" ForceFit="true"
+                                                                    DataKeyNames="MaintenanceId,RunningId,InstallationId,ProcessesId,SystemId" EnableMultiSelect="false" ShowGridHeader="true"
+                                                                    EnableColumnLines="true" OnRowCommand="gvMaintenance_RowCommand">
+                                                                    <Toolbars>
+                                                                        <f:Toolbar ID="Toolbar3" runat="server">
+                                                                            <Items>
+                                                                                <f:Button ID="btnMaintenanceAdd" Text="新增" Icon="Add" runat="server" OnClick="btnMaintenanceAdd_Click"></f:Button>
+                                                                            </Items>
+                                                                        </f:Toolbar>
+                                                                    </Toolbars>
+                                                                    <Columns>
+                                                                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                                            TextAlign="Center" />
+                                                                        <f:RenderField Width="300px" ColumnID="MaintenanceReason" DataField="MaintenanceReason" FieldType="String"
+                                                                            HeaderText="维护问题原因" HeaderTextAlign="Center" TextAlign="Left">
+                                                                            <Editor>
+                                                                                <f:TextArea runat="server" ID="txtMaintenanceReason"></f:TextArea>
+                                                                            </Editor>
+                                                                        </f:RenderField>
+                                                                        <f:RenderField Width="300px" ColumnID="MaintenanceHandle" DataField="MaintenanceHandle" FieldType="String"
+                                                                            HeaderText="维护问题处理" HeaderTextAlign="Center" TextAlign="Left">
+                                                                            <Editor>
+                                                                                <f:TextArea runat="server" ID="txtMaintenanceHandle"></f:TextArea>
+                                                                            </Editor>
+                                                                        </f:RenderField>
+                                                                        <f:LinkButtonField Width="100px" ConfirmText="是否确认删除当前选中数据？" ConfirmTarget="Top"
+                                                                            CommandName="Delete" Icon="Delete" />
+                                                                    </Columns>
+                                                                </f:Grid>
                                                             </Items>
                                                         </f:FormRow>
                                                     </Rows>
@@ -184,5 +227,115 @@
             </Rows>
         </f:Form>
     </form>
+
+
+    <script type="text/javascript">
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            return false;
+        }
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+
+        //验证检查结果
+        function isValid() {
+            var gvOption = F('<%= gvSystemOption.ClientID %>');
+            var valid = true, modifiedData = gvOption.getMergedData();
+
+            $.each(modifiedData, function (index, rowData) {
+                if (rowData.status === 'deleted') {
+                    return true;
+                }
+                var situation = rowData.values['Situation'];
+                if (typeof (situation) != 'undefined' && $.trim(situation) == '') {
+                    F.alert({
+                        message: '请输入运行情况！',
+                        ok: function () {
+                            gvOption.startEdit(rowData.id, 'Situation');
+                        }
+                    });
+                    valid = false;
+                    return false;
+                }
+                var remarks = rowData.values['Remarks'];
+                if (typeof (remarks) != 'undefined' && $.trim(remarks) == '') {
+                    F.alert({
+                        message: '请输入备注！',
+                        ok: function () {
+                            gvOption.startEdit(rowData.id, 'Remarks');
+                        }
+                    });
+                    valid = false;
+                    return false;
+                }
+            });
+
+            //操作问题
+            var gvOperation = F('<%= gvOperation.ClientID %>');
+            var valid = true, modifiedData = gvOperation.getMergedData();
+            $.each(modifiedData, function (index, rowData) {
+                if (rowData.status === 'deleted') {
+                    return true;
+                }
+                var operationReason = rowData.values['OperationReason'];
+                if (typeof (operationReason) != 'undefined' && $.trim(operationReason) == '') {
+                    F.alert({
+                        message: '请输入操作问题原因！',
+                        ok: function () {
+                            gvOperation.startEdit(rowData.id, 'OperationReason');
+                        }
+                    });
+                    valid = false;
+                    return false;
+                }
+                var operationHandle = rowData.values['OperationHandle'];
+                if (typeof (operationHandle) != 'undefined' && $.trim(operationHandle) == '') {
+                    F.alert({
+                        message: '请输入操作问题处理！',
+                        ok: function () {
+                            gvOperation.startEdit(rowData.id, 'OperationHandle');
+                        }
+                    });
+                    valid = false;
+                    return false;
+                }
+            });
+
+            //维护问题
+            var gvMaintenance = F('<%= gvMaintenance.ClientID %>');
+            var valid = true, modifiedData = gvMaintenance.getMergedData();
+            $.each(modifiedData, function (index, rowData) {
+                if (rowData.status === 'deleted') {
+                    return true;
+                }
+                var maintenanceReason = rowData.values['MaintenanceReason'];
+                if (typeof (maintenanceReason) != 'undefined' && $.trim(maintenanceReason) == '') {
+                    F.alert({
+                        message: '请输入维护问题原因！',
+                        ok: function () {
+                            gvMaintenance.startEdit(rowData.id, 'MaintenanceReason');
+                        }
+                    });
+                    valid = false;
+                    return false;
+                }
+                var maintenanceHandle = rowData.values['MaintenanceHandle'];
+                if (typeof (maintenanceHandle) != 'undefined' && $.trim(maintenanceHandle) == '') {
+                    F.alert({
+                        message: '请输入维护问题处理！',
+                        ok: function () {
+                            gvMaintenance.startEdit(rowData.id, 'MaintenanceHandle');
+                        }
+                    });
+                    valid = false;
+                    return false;
+                }
+            });
+            return valid;
+        }
+
+    </script>
+
 </body>
 </html>
diff --git a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx.cs
index 5f124b52..f25e6cc1 100644
--- a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx.cs
@@ -1,9 +1,15 @@
 using BLL;
+using FineUIPro.Web.DataShow;
+using FineUIPro.Web.ProjectData;
+using Model;
+using Newtonsoft.Json.Linq;
+using NPOI.SS.Formula.Functions;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices.ComTypes;
 using System.Web;
+using System.Web.Services.Description;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 
@@ -15,17 +21,12 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
         /// 日志
         /// </summary>
         public string RunningId { get { return (string)ViewState["RunningId"]; } set { ViewState["RunningId"] = value; } }
-        /// <summary>
-        /// 系统主键
-        /// </summary>
-        public string SystemId { get { return (string)ViewState["SystemId"]; } set { ViewState["SystemId"] = value; } }
 
         protected void Page_Load(object sender, EventArgs e)
         {
             if (!IsPostBack)
             {
                 this.RunningId = Request["RunningId"];
-                this.SystemId = Request["SystemId"];
                 PageBase();
             }
         }
@@ -35,6 +36,21 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
         /// </summary>
         public void PageBase()
         {
+            //获取系统
+            var syslist = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 3).ToList();
+            if (syslist.Count > 0)
+            {
+                int i = 0;
+                ListItem[] list = new ListItem[syslist.Count];
+                foreach (var item in syslist)
+                {
+                    list[i] = new ListItem(item.PreRunName, item.PreRunId);
+                    i++;
+                }
+                this.rdbOperation.DataSource = list;
+                this.rdbOperation.DataBind();
+            }
+
             //获取人员
             var userList = from user in Funs.DB.Sys_User
                            join projectrole in Funs.DB.Project_ProjectUser on user.UserId equals projectrole.UserId
@@ -63,93 +79,21 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
             var model = Funs.DB.Running_LogManagement.FirstOrDefault(x => x.RunningId == this.RunningId);
             if (model != null)
             {
+                options.Add(model.SystemId);
                 txtJobNo.Text = model.JobNo;
                 ddlShiftUser.SelectedValue = model.ShiftUser;
                 ddlSuccessionUser.SelectedValue = model.SuccessionUser;
                 txtStartData.Text = model.StartData.Value.ToString("yyyy-MM-dd HH:mm:ss");
                 txtEndData.Text = model.EndData.Value.ToString("yyyy-MM-dd HH:mm:ss");
-                if (model.IsDesalinated == 1)
-                {
-                    options.Add("1");
-                    tys.Hidden = false;
-                    txtDesalinatedSituation.Text = model.DesalinatedSituation;
-                    txtDesalinatedRemarks.Text = model.DesalinatedRemarks;
-                }
-                else
-                {
-                    tys.Hidden = true;
-                }
-                if (model.IsLoop == 1)
-                {
-                    options.Add("2");
-                    xhs.Hidden = false;
-                    txtLoopSituation.Text = model.LoopSituation;
-                    txtLoopRemarks.Text = model.LoopRemarks;
-                }
-                else
-                {
-                    xhs.Hidden = true;
-                }
-                if (model.IsSteam == 1)
-                {
-                    options.Add("3");
-                    zq.Hidden = false;
-                    txtSteamSituation.Text = model.SteamSituation;
-                    txtSteamRemarks.Text = model.SteamRemarks;
-                }
-                else
-                {
-                    zq.Hidden = true;
-                }
-                if (model.IsAirCompression == 1)
-                {
-                    options.Add("4");
-                    kyz.Hidden = false;
-                    txtAirCompressionSituation.Text = model.AirCompressionSituation;
-                    txtAirCompressionRemarks.Text = model.AirCompressionRemarks;
-                }
-                else
-                {
-                    kyz.Hidden = true;
-                }
-                if (model.IsCompoundAmmonia == 1)
-                {
-                    options.Add("5");
-                    hca.Hidden = false;
-                    txtCompoundAmmoniaSituation.Text = model.CompoundAmmoniaSituation;
-                    txtCompoundAmmoniaRemarks.Text = model.CompoundAmmoniaRemarks;
-                }
-                else
-                {
-                    hca.Hidden = true;
-                }
-                if (model.IsUrea == 1)
-                {
-                    options.Add("6");
-                    ns.Hidden = false;
-                    txtUreaSituation.Text = model.UreaSituation;
-                    txtUreaRemarks.Text = model.UreaRemarks;
-                }
-                else
-                {
-                    ns.Hidden = true;
-                }
                 rdbOperation.SelectedValueArray = options.ToArray();
                 txtHandoverCare.Text = model.HandoverCare;
-                txtOperationReason.Text = model.OperationReason;
-                txtOperationHandle.Text = model.OperationHandle;
-                txtMaintenanceReason.Text = model.MaintenanceReason;
-                txtMaintenanceHandle.Text = model.MaintenanceHandle;
+                DataBrid();
+                gvOperationBrid();
+                gvMaintenanceBrid();
             }
             else
             {
                 txtJobNo.Text = SQLHelper.RunProcNewId("SpGetNewCode5", "dbo.Running_LogManagement", "JobNo", "13022-PS81-");
-                tys.Hidden = true;
-                xhs.Hidden = true;
-                zq.Hidden = true;
-                kyz.Hidden = true;
-                hca.Hidden = true;
-                ns.Hidden = true;
             }
         }
 
@@ -158,13 +102,29 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
         /// </summary>
         protected void rdbOperation_SelectedIndexChanged(object sender, EventArgs e)
         {
-            var rdbArr = rdbOperation.SelectedValueArray;
-            tys.Hidden = rdbArr.Contains("1") ? false : true;
-            xhs.Hidden = rdbArr.Contains("2") ? false : true;
-            zq.Hidden = rdbArr.Contains("3") ? false : true;
-            kyz.Hidden = rdbArr.Contains("4") ? false : true;
-            hca.Hidden = rdbArr.Contains("5") ? false : true;
-            ns.Hidden = rdbArr.Contains("6") ? false : true;
+            var syslist = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 3).ToList();
+            var rdbIdArr = rdbOperation.SelectedItemArray;
+            var list = gvSystemOptionLs();
+            foreach (var item in rdbIdArr)
+            {
+                if (list.Count(x => x.SystemId == item.Value) > 0) continue;
+                var itemsys = syslist.FirstOrDefault(x => x.PreRunId == item.Value);
+                list.Add(new Running_LogManagementDto
+                {
+                    RunningId = Guid.NewGuid().ToString(),
+                    ProjectId = this.CurrUser.LoginProjectId,
+                    InstallationId = itemsys.InstallationId,
+                    ProcessesId = itemsys.ProcessesId,
+                    SystemId = itemsys.SystemId,
+                    SystemName = itemsys.PreRunName,
+                    Situation = "",
+                    Remarks = "",
+                    AddUser = CurrUser.UserId,
+                    AddTime = DateTime.Now,
+                });
+            }
+            list.RemoveAll(r => !rdbOperation.SelectedValueArray.Contains(r.SystemId));
+            DataBrid(list);
         }
 
         /// <summary>
@@ -182,77 +142,370 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
                 ShowNotify("请选择继任职工!", MessageBoxIcon.Warning);
                 return;
             }
-            var sysmodel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.PreRunId == this.SystemId);
-            if (sysmodel == null)
+            var list = gvSystemOptionLs();
+            if (list.Count == 0)
             {
-                Alert.ShowInTop("系统参数错误！", MessageBoxIcon.Warning);
+                ShowNotify("请选择系统!", MessageBoxIcon.Warning);
+                return;
+            }
+            var optionlist = gvOperationLs();
+            if (optionlist.Count == 0)
+            {
+                ShowNotify("请添加操作问题!", MessageBoxIcon.Warning);
+                return;
+            }
+            var maintenancelist = gvMaintenanceLs();
+            if (maintenancelist.Count == 0)
+            {
+                ShowNotify("请添加维护问题!", MessageBoxIcon.Warning);
                 return;
             }
 
-            var edata = DateTime.Parse(txtEndData.Text);
-            if (!string.IsNullOrWhiteSpace(this.RunningId))
+            var addlist = new List<Running_LogManagement>();
+            var addoptionlist = new List<Running_Operation>();
+            var addmaintenancelist = new List<Running_Maintenance>();
+            var ids = list.ConvertAll(x => x.RunningId);
+            var existlist = Funs.DB.Running_LogManagement.Where(x => ids.Contains(x.RunningId)).ToList();
+            foreach (var item in list)
             {
-                if (Funs.DB.Running_LogManagement.Count(x => x.ShiftType == ddlShiftType.SelectedValue && x.SystemId == this.SystemId && x.EndData.Value.Year == edata.Year && x.EndData.Value.Month == edata.Month && x.EndData.Value.Day == edata.Day && x.RunningId != this.RunningId) > 0)
+                bool add = false;
+                var model = existlist.FirstOrDefault(x => x.RunningId == this.RunningId);
+                if (model == null)
                 {
-                    Alert.ShowInTop($"{DateTime.Now.ToString("yyyy-MM-dd")}已添加{ddlShiftType.SelectedText}日志，无法继续添加！", MessageBoxIcon.Warning);
-                    return;
+                    add = true;
+                    model = new Running_LogManagement();
+                    model.RunningId = Guid.NewGuid().ToString();
+                    model.ProjectId = this.CurrUser.LoginProjectId;
+                    model.AddUser = this.CurrUser.UserId;
+                    model.AddTime = DateTime.Now;
+                }
+                model.InstallationId = item.InstallationId;
+                model.ProcessesId = item.ProcessesId;
+                model.SystemId = item.SystemId;
+                model.JobNo = txtJobNo.Text;
+                model.HandoverCare = txtHandoverCare.Text;
+                model.ShiftType = ddlShiftType.SelectedValue;
+                model.ShiftUser = ddlShiftUser.SelectedValue;
+                model.SuccessionUser = ddlSuccessionUser.SelectedValue;
+                model.StartData = DateTime.Parse(txtStartData.Text);
+                model.EndData = DateTime.Parse(txtEndData.Text);
+                model.Situation = item.Situation;
+                model.Remarks = item.Remarks;
+
+                foreach (var itemoption in optionlist)
+                {
+                    addoptionlist.Add(new Running_Operation()
+                    {
+                        OperationId = Guid.NewGuid().ToString(),
+                        RunningId = model.RunningId,
+                        InstallationId = item.InstallationId,
+                        ProcessesId = item.ProcessesId,
+                        SystemId = item.SystemId,
+                        OperationReason = itemoption.OperationReason,
+                        OperationHandle = itemoption.OperationHandle,
+                        ProjectId = this.CurrUser.LoginProjectId,
+                        AddUser = this.CurrUser.UserId,
+                        AddTime = DateTime.Now,
+                    });
+                }
+                foreach (var itemmain in maintenancelist)
+                {
+                    addmaintenancelist.Add(new Running_Maintenance()
+                    {
+                        MaintenanceId = Guid.NewGuid().ToString(),
+                        RunningId = model.RunningId,
+                        InstallationId = item.InstallationId,
+                        ProcessesId = item.ProcessesId,
+                        SystemId = item.SystemId,
+                        MaintenanceReason = itemmain.MaintenanceReason,
+                        MaintenanceHandle = itemmain.MaintenanceHandle,
+                        ProjectId = this.CurrUser.LoginProjectId,
+                        AddUser = this.CurrUser.UserId,
+                        AddTime = DateTime.Now,
+                    });
+                }
+                if (add)
+                {
+                    Funs.DB.SubmitChanges();
+                    addlist.Add(model);
+                }
+                else
+                {
+                    Funs.DB.SubmitChanges();
                 }
             }
-            else
+            if (addlist.Count > 0) Funs.DB.Running_LogManagement.InsertAllOnSubmit(addlist);
+            var runIds = list.ConvertAll(x => x.RunningId);
+            var deleteOperas = Funs.DB.Running_Operation.Where(x => runIds.Contains(x.RunningId)).ToList();
+            if (deleteOperas.Count > 0)
             {
-                if (Funs.DB.Running_LogManagement.Count(x => x.ShiftType == ddlShiftType.SelectedValue && x.SystemId == this.SystemId && x.EndData.Value.Year == edata.Year && x.EndData.Value.Month == edata.Month && x.EndData.Value.Day == edata.Day) > 0)
-                {
-                    Alert.ShowInTop($"{DateTime.Now.ToString("yyyy-MM-dd")}已添加{ddlShiftType.SelectedText}日志，无法继续添加！", MessageBoxIcon.Warning);
-                    return;
-                }
+                Funs.DB.Running_Operation.DeleteAllOnSubmit(deleteOperas);
+                Funs.DB.SubmitChanges();
             }
-            bool add = false;
-            var model = Funs.DB.Running_LogManagement.FirstOrDefault(x => x.RunningId == this.RunningId);
-            if (model == null)
+            var deleteMaints = Funs.DB.Running_Maintenance.Where(x => runIds.Contains(x.RunningId)).ToList();
+            if (deleteMaints.Count > 0)
             {
-                add = true;
-                model = new Model.Running_LogManagement();
-                model.RunningId = Guid.NewGuid().ToString();
-                model.ProjectId = this.CurrUser.LoginProjectId;
-                model.InstallationId = sysmodel.InstallationId;
-                model.ProcessesId = sysmodel.ProcessesId;
-                model.SystemId = this.SystemId;
-                model.AddUser = this.CurrUser.UserId;
-                model.AddTime = DateTime.Now;
+                Funs.DB.Running_Maintenance.DeleteAllOnSubmit(deleteMaints);
+                Funs.DB.SubmitChanges();
             }
-            model.JobNo = txtJobNo.Text;
-            model.ShiftType = ddlShiftType.SelectedValue;
-            model.ShiftUser = ddlShiftUser.SelectedValue;
-            model.SuccessionUser = ddlSuccessionUser.SelectedValue;
-            model.StartData = DateTime.Parse(txtStartData.Text);
-            model.EndData = DateTime.Parse(txtEndData.Text);
-            model.IsDesalinated = rdbOperation.SelectedValueArray.Contains("1") ? 1 : 0;
-            model.DesalinatedSituation = txtDesalinatedSituation.Text;
-            model.DesalinatedRemarks = txtDesalinatedRemarks.Text;
-            model.IsLoop = rdbOperation.SelectedValueArray.Contains("2") ? 1 : 0;
-            model.LoopSituation = txtLoopSituation.Text;
-            model.LoopRemarks = txtLoopRemarks.Text;
-            model.IsSteam = rdbOperation.SelectedValueArray.Contains("3") ? 1 : 0;
-            model.SteamSituation = txtSteamSituation.Text;
-            model.SteamRemarks = txtSteamRemarks.Text;
-            model.IsAirCompression = rdbOperation.SelectedValueArray.Contains("4") ? 1 : 0;
-            model.AirCompressionSituation = txtAirCompressionSituation.Text;
-            model.AirCompressionRemarks = txtAirCompressionRemarks.Text;
-            model.IsCompoundAmmonia = rdbOperation.SelectedValueArray.Contains("5") ? 1 : 0;
-            model.CompoundAmmoniaSituation = txtCompoundAmmoniaSituation.Text;
-            model.CompoundAmmoniaRemarks = txtCompoundAmmoniaRemarks.Text;
-            model.IsUrea = rdbOperation.SelectedValueArray.Contains("6") ? 1 : 0;
-            model.UreaSituation = txtUreaSituation.Text;
-            model.UreaRemarks = txtUreaRemarks.Text;
-            model.HandoverCare = txtHandoverCare.Text;
-            model.OperationReason = txtOperationReason.Text;
-            model.OperationHandle = txtOperationHandle.Text;
-            model.MaintenanceReason = txtMaintenanceReason.Text;
-            model.MaintenanceHandle = txtMaintenanceHandle.Text;
-            if (add) Funs.DB.Running_LogManagement.InsertOnSubmit(model);
+            Funs.DB.Running_Operation.InsertAllOnSubmit(addoptionlist);
+            Funs.DB.Running_Maintenance.InsertAllOnSubmit(addmaintenancelist);
             Funs.DB.SubmitChanges();
+
             ShowNotify("操作成功!", MessageBoxIcon.Success);
             PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
         }
+
+        /// <summary>
+        /// 日志管理绑定
+        /// </summary>
+        public void DataBrid(List<Running_LogManagementDto> list = null)
+        {
+            if (list == null) list = new List<Running_LogManagementDto>();
+            var query = from a in Funs.DB.Running_LogManagement
+                        join b in Funs.DB.PreRun_SysDevice on a.SystemId equals b.PreRunId
+                        where a.RunningId == this.RunningId
+                        select new Running_LogManagementDto
+                        {
+                            RunningId = a.RunningId,
+                            ProjectId = a.ProjectId,
+                            InstallationId = a.InstallationId,
+                            ProcessesId = a.ProcessesId,
+                            SystemId = a.SystemId,
+                            SystemName = b.PreRunName,
+                            JobNo = a.JobNo,
+                            ShiftType = a.ShiftType,
+                            ShiftUser = a.ShiftUser,
+                            SuccessionUser = a.SuccessionUser,
+                            StartData = a.StartData,
+                            EndData = a.EndData,
+                            Situation = a.Situation,
+                            Remarks = a.Remarks,
+                            HandoverCare = a.HandoverCare,
+                            AddUser = a.AddUser,
+                            AddTime = a.AddTime
+                        };
+
+            var data = query.ToList();
+            if (data.Count > 0) list.AddRange(data);
+            gvSystemOption.DataSource = list;
+            gvSystemOption.DataBind();
+        }
+
+        /// <summary>
+        /// 获取绑定集合
+        /// </summary>
+        private List<Running_LogManagementDto> gvSystemOptionLs()
+        {
+            List<Running_LogManagementDto> massQuestionLs = new List<Running_LogManagementDto>();
+            JArray mergedData = gvSystemOption.GetMergedData();
+            foreach (JObject mergedRow in mergedData)
+            {
+                string status = mergedRow.Value<string>("status");
+                JObject values = mergedRow.Value<JObject>("values");
+                int i = mergedRow.Value<int>("index");
+                massQuestionLs.Add(new Running_LogManagementDto
+                {
+                    RunningId = this.gvSystemOption.Rows[i].DataKeys[0].ToString(),
+                    ProjectId = this.CurrUser.LoginProjectId,
+                    InstallationId = this.gvSystemOption.Rows[i].DataKeys[1].ToString(),
+                    ProcessesId = this.gvSystemOption.Rows[i].DataKeys[2].ToString(),
+                    SystemId = this.gvSystemOption.Rows[i].DataKeys[3].ToString(),
+                    SystemName = this.gvSystemOption.Rows[i].DataKeys[4].ToString(),
+                    Situation = values.Value<string>("Situation"),
+                    Remarks = values.Value<string>("Remarks"),
+                    AddUser = CurrUser.UserId,
+                    AddTime = DateTime.Now,
+                });
+            }
+            return massQuestionLs;
+        }
+
+        public class Running_LogManagementDto : Running_LogManagement
+        {
+            public string SystemName { get; set; }
+        }
+
+        #region 操作问题
+
+        /// <summary>
+        /// 操作问题绑定
+        /// </summary>
+        public void gvOperationBrid()
+        {
+            var list = Funs.DB.Running_Operation.Where(x => x.RunningId == this.RunningId).ToList();
+            gvOperation.DataSource = list;
+            gvOperation.DataBind();
+        }
+
+        /// <summary>
+        /// 操作问题集合
+        /// </summary>
+        private List<Running_Operation> gvOperationLs()
+        {
+            List<Running_Operation> massQuestionLs = new List<Running_Operation>();
+            JArray mergedData = gvOperation.GetMergedData();
+            foreach (JObject mergedRow in mergedData)
+            {
+                string status = mergedRow.Value<string>("status");
+                JObject values = mergedRow.Value<JObject>("values");
+                int i = mergedRow.Value<int>("index");
+                massQuestionLs.Add(new Running_Operation
+                {
+                    OperationId = IsStrVal(this.gvOperation.Rows[i].DataKeys[0]),
+                    RunningId = IsStrVal(this.gvOperation.Rows[i].DataKeys[1]),
+                    ProjectId = this.CurrUser.LoginProjectId,
+                    InstallationId = IsStrVal(this.gvOperation.Rows[i].DataKeys[2]),
+                    ProcessesId = IsStrVal(this.gvOperation.Rows[i].DataKeys[3]),
+                    SystemId = IsStrVal(this.gvOperation.Rows[i].DataKeys[4]),
+                    OperationReason = values.Value<string>("OperationReason"),
+                    OperationHandle = values.Value<string>("OperationHandle"),
+                    AddUser = CurrUser.UserId,
+                    AddTime = DateTime.Now,
+                    Sort = i
+                });
+            }
+            return massQuestionLs;
+        }
+
+        /// <summary>
+        /// 维护问题删除
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void gvOperation_RowCommand(object sender, GridCommandEventArgs e)
+        {
+            if (e.CommandName == "Delete")
+            {
+                string rowID = e.RowID;
+                var model = Funs.DB.Running_Operation.FirstOrDefault(p => p.OperationId == rowID);
+                if (model != null)
+                {
+                    Funs.DB.Running_Operation.DeleteOnSubmit(model);
+                    Funs.DB.SubmitChanges();
+                    gvOperationBrid();
+                    ShowNotify("删除成功!");
+                }
+                else
+                {
+                    var list = gvOperationLs();
+                    list.RemoveAll(x => x.OperationId == rowID);
+                    gvOperation.DataSource = list;
+                    gvOperation.DataBind();
+                    ShowNotify("删除成功!");
+                }
+            }
+        }
+
+        /// <summary>
+        /// 新增
+        /// </summary>
+        protected void btnOperationAdd_Click(object sender, EventArgs e)
+        {
+            var list = gvOperationLs();
+            Running_Operation model = new Running_Operation
+            {
+                OperationId = Guid.NewGuid().ToString()
+            };
+            list.Add(model);
+            this.gvOperation.DataSource = list;
+            this.gvOperation.DataBind();
+        }
+
+        #endregion
+
+        #region 维护问题
+
+        /// <summary>
+        /// 维护问题绑定
+        /// </summary>
+        public void gvMaintenanceBrid()
+        {
+            var list = Funs.DB.Running_Maintenance.Where(x => x.RunningId == this.RunningId).ToList();
+            gvMaintenance.DataSource = list;
+            gvMaintenance.DataBind();
+        }
+
+        /// <summary>
+        /// 维护问题集合
+        /// </summary>
+        private List<Running_Maintenance> gvMaintenanceLs()
+        {
+            List<Running_Maintenance> massQuestionLs = new List<Running_Maintenance>();
+            JArray mergedData = gvMaintenance.GetMergedData();
+            foreach (JObject mergedRow in mergedData)
+            {
+                string status = mergedRow.Value<string>("status");
+                JObject values = mergedRow.Value<JObject>("values");
+                int i = mergedRow.Value<int>("index");
+                massQuestionLs.Add(new Running_Maintenance
+                {
+                    MaintenanceId = IsStrVal(this.gvMaintenance.Rows[i].DataKeys[0]),
+                    RunningId = IsStrVal(this.gvMaintenance.Rows[i].DataKeys[1]),
+                    ProjectId = this.CurrUser.LoginProjectId,
+                    InstallationId = IsStrVal(this.gvMaintenance.Rows[i].DataKeys[2]),
+                    ProcessesId = IsStrVal(this.gvMaintenance.Rows[i].DataKeys[3]),
+                    SystemId = IsStrVal(this.gvMaintenance.Rows[i].DataKeys[4]),
+                    MaintenanceReason = values.Value<string>("MaintenanceReason"),
+                    MaintenanceHandle = values.Value<string>("MaintenanceHandle"),
+                    AddUser = CurrUser.UserId,
+                    AddTime = DateTime.Now,
+                    Sort = i
+                });
+            }
+            return massQuestionLs;
+        }
+
+        /// <summary>
+        /// 维护问题删除
+        /// </summary>
+        protected void gvMaintenance_RowCommand(object sender, GridCommandEventArgs e)
+        {
+            if (e.CommandName == "Delete")
+            {
+                string rowID = e.RowID;
+                var model = Funs.DB.Running_Maintenance.FirstOrDefault(p => p.MaintenanceId == rowID);
+                if (model != null)
+                {
+                    Funs.DB.Running_Maintenance.DeleteOnSubmit(model);
+                    Funs.DB.SubmitChanges();
+                    gvMaintenanceBrid();
+                    ShowNotify("删除成功!");
+                }
+                else
+                {
+                    var list = gvMaintenanceLs();
+                    list.RemoveAll(x => x.MaintenanceId == rowID);
+                    gvMaintenance.DataSource = list;
+                    gvMaintenance.DataBind();
+                    ShowNotify("删除成功!");
+                }
+            }
+        }
+
+        /// <summary>
+        /// 新增
+        /// </summary>
+        protected void btnMaintenanceAdd_Click(object sender, EventArgs e)
+        {
+            var list = gvMaintenanceLs();
+            Running_Maintenance model = new Running_Maintenance
+            {
+                MaintenanceId = Guid.NewGuid().ToString()
+            };
+            list.Add(model);
+            this.gvMaintenance.DataSource = list;
+            this.gvMaintenance.DataBind();
+        }
+
+        #endregion
+
+        public string IsStrVal(object value)
+        {
+            var result = string.Empty;
+            if (value != null) result = value.ToString();
+            return result;
+        }
+
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx.designer.cs
index 716dd71c..bd1e4335 100644
--- a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx.designer.cs
@@ -150,166 +150,67 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
         protected global::FineUIPro.CheckBoxList rdbOperation;
 
         /// <summary>
-        /// tys 控件。
+        /// ContentPanel4 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.FormRow tys;
+        protected global::FineUIPro.ContentPanel ContentPanel4;
 
         /// <summary>
-        /// txtDesalinatedSituation 控件。
+        /// Form5 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextArea txtDesalinatedSituation;
+        protected global::FineUIPro.Form Form5;
 
         /// <summary>
-        /// txtDesalinatedRemarks 控件。
+        /// gvSystemOption 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextArea txtDesalinatedRemarks;
+        protected global::FineUIPro.Grid gvSystemOption;
 
         /// <summary>
-        /// xhs 控件。
+        /// txtSituation 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.FormRow xhs;
+        protected global::FineUIPro.TextArea txtSituation;
 
         /// <summary>
-        /// txtLoopSituation 控件。
+        /// txtRemarks 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextArea txtLoopSituation;
+        protected global::FineUIPro.TextArea txtRemarks;
 
         /// <summary>
-        /// txtLoopRemarks 控件。
+        /// ContentPanel5 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextArea txtLoopRemarks;
+        protected global::FineUIPro.ContentPanel ContentPanel5;
 
         /// <summary>
-        /// zq 控件。
+        /// Form6 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.FormRow zq;
-
-        /// <summary>
-        /// txtSteamSituation 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextArea txtSteamSituation;
-
-        /// <summary>
-        /// txtSteamRemarks 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextArea txtSteamRemarks;
-
-        /// <summary>
-        /// kyz 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.FormRow kyz;
-
-        /// <summary>
-        /// txtAirCompressionSituation 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextArea txtAirCompressionSituation;
-
-        /// <summary>
-        /// txtAirCompressionRemarks 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextArea txtAirCompressionRemarks;
-
-        /// <summary>
-        /// hca 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.FormRow hca;
-
-        /// <summary>
-        /// txtCompoundAmmoniaSituation 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextArea txtCompoundAmmoniaSituation;
-
-        /// <summary>
-        /// txtCompoundAmmoniaRemarks 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextArea txtCompoundAmmoniaRemarks;
-
-        /// <summary>
-        /// ns 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.FormRow ns;
-
-        /// <summary>
-        /// txtUreaSituation 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextArea txtUreaSituation;
-
-        /// <summary>
-        /// txtUreaRemarks 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextArea txtUreaRemarks;
+        protected global::FineUIPro.Form Form6;
 
         /// <summary>
         /// txtHandoverCare 控件。
@@ -338,6 +239,33 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
         /// </remarks>
         protected global::FineUIPro.Form Form3;
 
+        /// <summary>
+        /// gvOperation 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid gvOperation;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// btnOperationAdd 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOperationAdd;
+
         /// <summary>
         /// txtOperationReason 控件。
         /// </summary>
@@ -374,6 +302,33 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
         /// </remarks>
         protected global::FineUIPro.Form Form4;
 
+        /// <summary>
+        /// gvMaintenance 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid gvMaintenance;
+
+        /// <summary>
+        /// Toolbar3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar3;
+
+        /// <summary>
+        /// btnMaintenanceAdd 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnMaintenanceAdd;
+
         /// <summary>
         /// txtMaintenanceReason 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx
index 470d6eab..3de02858 100644
--- a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx
@@ -84,6 +84,12 @@
                     <Columns>
                         <f:RowNumberField />
                         <f:RenderField ColumnID="ProjectName" DataField="ProjectName" HeaderText="项目名称" HeaderTextAlign="Center">
+                        </f:RenderField>                        
+                        <f:RenderField ColumnID="InstallationName" DataField="InstallationName" HeaderText="装置名称" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ProcessesName" DataField="ProcessesName" HeaderText="工序名称" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="SystemName" DataField="SystemName" HeaderText="系统名称" HeaderTextAlign="Center">
                         </f:RenderField>
                         <f:RenderField ColumnID="JobNo" DataField="JobNo" HeaderText="工作编号" HeaderTextAlign="Center">
                         </f:RenderField>
@@ -119,7 +125,7 @@
                 </f:Grid>
             </Items>
         </f:Panel>
-        <f:Window ID="Window1" Title="检查项巡检确认" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        <f:Window ID="Window1" Title="运行日志管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
             Width="1300px" Height="660px">
         </f:Window>
diff --git a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx.cs
index f037aa0d..e0aa1d48 100644
--- a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx.cs
@@ -19,17 +19,13 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
 {
     public partial class RunningLogManagementList : PageBase
     {
-        /// <summary>
-        /// 系统主键
-        /// </summary>
-        public string SystemId { get { return (string)ViewState["SystemId"]; } set { ViewState["SystemId"] = value; } }
-
         protected void Page_Load(object sender, EventArgs e)
         {
             if (!IsPostBack)
             {
                 //绑定数据
                 InitTreeMenu();
+                BindGrid();
             }
         }
 
@@ -99,10 +95,6 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
         /// </summary>
         protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
         {
-            if (this.tvControlItem.SelectedNodeID.Split('|').Length > 2)
-            {
-                this.SystemId = this.tvControlItem.SelectedNodeID.Split('|').Last();
-            }
             this.BindGrid();
         }
 
@@ -115,14 +107,17 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
         /// </summary>
         public void BindGrid()
         {
-            string strSql = @"select a.RunningId,a.ProjectId,project.ProjectName as ProjectName,a.InstallationId,a.ProcessesId,a.SystemId,a.JobNo,a.ShiftType,(case a.ShiftType when 1 then '白班' else '夜班' end) as ShiftTypeName,a.ShiftUser,shiftuser.UserName as ShiftUserName,a.SuccessionUser,successuser.UserName as SuccessionUserName,a.StartData,a.EndData,a.IsDesalinated,a.DesalinatedSituation,a.DesalinatedRemarks,a.IsLoop,a.LoopSituation,a.LoopRemarks,a.IsSteam,a.SteamSituation,a.SteamRemarks,a.IsAirCompression,a.AirCompressionSituation,a.AirCompressionRemarks,a.IsCompoundAmmonia,a.CompoundAmmoniaSituation,a.CompoundAmmoniaRemarks,a.IsUrea,a.UreaSituation,a.UreaRemarks,a.HandoverCare,a.OperationReason,a.OperationHandle,a.MaintenanceReason,a.MaintenanceHandle,a.AddUser,a.AddTime,a.Sort from Running_LogManagement as a inner join Sys_User as shiftuser on shiftuser.UserId=a.ShiftUser inner join Sys_User as successuser on successuser.UserId=a.SuccessionUser inner join Base_Project as project on project.ProjectId=a.ProjectId ";
+            string strSql = @"select a.RunningId,a.ProjectId,project.ProjectName as ProjectName,a.InstallationId,a.ProcessesId,a.SystemId,inst.PreRunName as InstallationName,proce.PreRunName as ProcessesName,syst.PreRunName as SystemName,a.JobNo,a.ShiftType,(case a.ShiftType when 1 then '白班' else '夜班' end) as ShiftTypeName,a.ShiftUser,shiftuser.UserName as ShiftUserName,a.SuccessionUser,successuser.UserName as SuccessionUserName,a.StartData,a.EndData,a.AddUser,a.AddTime,a.Sort from Running_LogManagement as a inner join Sys_User as shiftuser on shiftuser.UserId=a.ShiftUser inner join Sys_User as successuser on successuser.UserId=a.SuccessionUser inner join Base_Project as project on project.ProjectId=a.ProjectId inner join PreRun_SysDevice as inst on inst.PreRunId=a.InstallationId inner join PreRun_SysDevice as proce on proce.PreRunId=a.ProcessesId inner join PreRun_SysDevice as syst on syst.PreRunId=a.SystemId where a.ProjectId=@ProjectId ";
             List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@projectid", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
             if (this.tvControlItem.SelectedNodeID.Split('|').Length > 0)
             {
                 var installationId = this.tvControlItem.SelectedNodeID.Split('|').First();
-                strSql += " and a.InstallationId=@InstallationId";
-                listStr.Add(new SqlParameter("@InstallationId", installationId));
+                if (installationId != "0" && !string.IsNullOrWhiteSpace(installationId))
+                {
+                    strSql += " and a.InstallationId=@InstallationId";
+                    listStr.Add(new SqlParameter("@InstallationId", installationId));
+                }
             }
             if (this.tvControlItem.SelectedNodeID.Split('|').Length > 1)
             {
@@ -209,12 +204,7 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
         /// </summary>
         protected void btnAdd_Click(object sender, EventArgs e)
         {
-            if (string.IsNullOrWhiteSpace(this.SystemId))
-            {
-                Alert.ShowInTop("请选择系统！", MessageBoxIcon.Warning);
-                return;
-            }
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("RunningLogManagementEdit.aspx?RunningId=&SystemId=" + this.SystemId, "新增 - ")));
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("RunningLogManagementEdit.aspx?RunningId=", "新增 - ")));
         }
 
         /// <summary>
@@ -227,7 +217,7 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
                 Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
                 return;
             }
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("RunningLogManagementEdit.aspx?RunningId={0}&SystemId={1}", Grid1.SelectedRowID, this.SystemId, "编辑 - ")));
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("RunningLogManagementEdit.aspx?RunningId={0}", Grid1.SelectedRowID, "编辑 - ")));
         }
 
         /// <summary>
@@ -290,31 +280,11 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
                            ShiftUserName = c.UserName,
                            a.SuccessionUser,
                            SuccessionUserName = d.UserName,
+                           a.HandoverCare,
                            a.StartData,
                            a.EndData,
-                           a.IsDesalinated,
-                           a.DesalinatedSituation,
-                           a.DesalinatedRemarks,
-                           a.IsLoop,
-                           a.LoopSituation,
-                           a.LoopRemarks,
-                           a.IsSteam,
-                           a.SteamSituation,
-                           a.SteamRemarks,
-                           a.IsAirCompression,
-                           a.AirCompressionSituation,
-                           a.AirCompressionRemarks,
-                           a.IsCompoundAmmonia,
-                           a.CompoundAmmoniaSituation,
-                           a.CompoundAmmoniaRemarks,
-                           a.IsUrea,
-                           a.UreaSituation,
-                           a.UreaRemarks,
-                           a.HandoverCare,
-                           a.OperationReason,
-                           a.OperationHandle,
-                           a.MaintenanceReason,
-                           a.MaintenanceHandle,
+                           a.Situation,
+                           a.Remarks,
                            a.AddUser,
                            a.AddTime,
                            a.Sort
@@ -322,6 +292,10 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
             var model = data.FirstOrDefault();
             if (model != null)
             {
+                //操作问题
+                var operations = Funs.DB.Running_Operation.Where(x => x.RunningId == model.RunningId).ToList();
+                //维护问题
+                var maintes = Funs.DB.Running_Maintenance.Where(x => x.RunningId == model.RunningId).ToList();
                 string ReportFileName = $"{filePath}Production report（{DateTime.Now.ToString("yyyy-MM-dd")} {model.ShiftUserName}).xlsx";
                 int rowIndex = 0;
                 XSSFWorkbook hssfworkbook = new XSSFWorkbook();
@@ -404,138 +378,27 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
                 #region 数据
 
                 var dataIndex = 5;
-                if (model.IsDesalinated == 1)
-                {
-                    ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5);
-                    region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 3);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue("DW  Station 脱盐水");
-                    ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = styleLeftBold;
-                    region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 4, 5);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 1).GetCell(4).SetCellValue("");
-                    ws.GetRow(dataIndex + 1).GetCell(4).CellStyle = leftStyle;
-                    ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 2, dataIndex + 2, 0, 5, 90);
-                    region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 0, 3);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 2).GetCell(0).SetCellValue(model.DesalinatedSituation);
-                    ws.GetRow(dataIndex + 2).GetCell(0).CellStyle = leftStyle;
-                    region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 4, 5);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 2).GetCell(4).SetCellValue(model.DesalinatedRemarks);
-                    ws.GetRow(dataIndex + 2).GetCell(4).CellStyle = leftStyle;
-                    dataIndex += 2;
-                }
-                if (model.IsLoop == 1)
-                {
-                    ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5);
-                    region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 3);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue("ACW/UCW/ECW  Station 循环水");
-                    ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = styleLeftBold;
-                    region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 4, 5);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 1).GetCell(4).SetCellValue("");
-                    ws.GetRow(dataIndex + 1).GetCell(4).CellStyle = leftStyle;
-                    ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 2, dataIndex + 2, 0, 5, 90);
-                    region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 0, 3);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 2).GetCell(0).SetCellValue(model.LoopSituation);
-                    ws.GetRow(dataIndex + 2).GetCell(0).CellStyle = leftStyle;
-                    region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 4, 5);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 2).GetCell(4).SetCellValue(model.LoopRemarks);
-                    ws.GetRow(dataIndex + 2).GetCell(4).CellStyle = leftStyle;
-                    dataIndex += 2;
-                }
-                if (model.IsSteam == 1)
-                {
-                    ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5);
-                    region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 3);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue("Steam System蒸汽");
-                    ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = styleLeftBold;
-                    region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 4, 5);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 1).GetCell(4).SetCellValue("");
-                    ws.GetRow(dataIndex + 1).GetCell(4).CellStyle = leftStyle;
-                    ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 2, dataIndex + 2, 0, 5, 90);
-                    region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 0, 3);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 2).GetCell(0).SetCellValue(model.SteamSituation);
-                    ws.GetRow(dataIndex + 2).GetCell(0).CellStyle = leftStyle;
-                    region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 4, 5);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 2).GetCell(4).SetCellValue(model.SteamRemarks);
-                    ws.GetRow(dataIndex + 2).GetCell(4).CellStyle = leftStyle;
-                    dataIndex += 2;
-                }
-                if (model.IsAirCompression == 1)
-                {
-                    ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5);
-                    region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 3);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue("Air Station 空压站");
-                    ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = styleLeftBold;
-                    region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 4, 5);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 1).GetCell(4).SetCellValue("");
-                    ws.GetRow(dataIndex + 1).GetCell(4).CellStyle = leftStyle;
-                    ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 2, dataIndex + 2, 0, 5, 90);
-                    region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 0, 3);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 2).GetCell(0).SetCellValue(model.AirCompressionSituation);
-                    ws.GetRow(dataIndex + 2).GetCell(0).CellStyle = leftStyle;
-                    region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 4, 5);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 2).GetCell(4).SetCellValue(model.AirCompressionRemarks);
-                    ws.GetRow(dataIndex + 2).GetCell(4).CellStyle = leftStyle;
-                    dataIndex += 2;
-                }
-                if (model.IsCompoundAmmonia == 1)
-                {
-                    ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5);
-                    region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 3);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue("Ammonia Plant 合成氨");
-                    ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = styleLeftBold;
-                    region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 4, 5);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 1).GetCell(4).SetCellValue("");
-                    ws.GetRow(dataIndex + 1).GetCell(4).CellStyle = leftStyle;
-                    ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 2, dataIndex + 2, 0, 5, 90);
-                    region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 0, 3);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 2).GetCell(0).SetCellValue(model.CompoundAmmoniaSituation);
-                    ws.GetRow(dataIndex + 2).GetCell(0).CellStyle = leftStyle;
-                    region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 4, 5);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 2).GetCell(4).SetCellValue(model.CompoundAmmoniaRemarks);
-                    ws.GetRow(dataIndex + 2).GetCell(4).CellStyle = leftStyle;
-                    dataIndex += 2;
-                }
-                if (model.IsUrea == 1)
-                {
-                    ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5);
-                    region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 3);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue("Urea Plant 尿素");
-                    ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = styleLeftBold;
-                    region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 4, 5);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 1).GetCell(4).SetCellValue("");
-                    ws.GetRow(dataIndex + 1).GetCell(4).CellStyle = leftStyle;
-                    ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 2, dataIndex + 2, 0, 5, 90);
-                    region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 0, 3);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 2).GetCell(0).SetCellValue(model.UreaSituation);
-                    ws.GetRow(dataIndex + 2).GetCell(0).CellStyle = leftStyle;
-                    region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 4, 5);
-                    ws.AddMergedRegion(region);
-                    ws.GetRow(dataIndex + 2).GetCell(4).SetCellValue(model.UreaRemarks);
-                    ws.GetRow(dataIndex + 2).GetCell(4).CellStyle = leftStyle;
-                    dataIndex += 2;
-                }
+
+                ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5);
+                region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 3);
+                ws.AddMergedRegion(region);
+                ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue("DW  Station 脱盐水");
+                ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = styleLeftBold;
+                region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 4, 5);
+                ws.AddMergedRegion(region);
+                ws.GetRow(dataIndex + 1).GetCell(4).SetCellValue("");
+                ws.GetRow(dataIndex + 1).GetCell(4).CellStyle = leftStyle;
+                ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 2, dataIndex + 2, 0, 5, 90);
+                region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 0, 3);
+                ws.AddMergedRegion(region);
+                ws.GetRow(dataIndex + 2).GetCell(0).SetCellValue(model.Situation);
+                ws.GetRow(dataIndex + 2).GetCell(0).CellStyle = leftStyle;
+                region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 4, 5);
+                ws.AddMergedRegion(region);
+                ws.GetRow(dataIndex + 2).GetCell(4).SetCellValue(model.Remarks);
+                ws.GetRow(dataIndex + 2).GetCell(4).CellStyle = leftStyle;
+                dataIndex += 2;
+
                 ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5);
                 region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 5);
                 ws.AddMergedRegion(region);
@@ -547,38 +410,51 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
                 ws.GetRow(dataIndex + 2).GetCell(0).SetCellValue(model.HandoverCare);
                 ws.GetRow(dataIndex + 2).GetCell(0).CellStyle = leftStyle;
                 dataIndex += 2;
+
+
                 ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5);
                 region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 5);
                 ws.AddMergedRegion(region);
                 ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue("operation issue操作问题");
                 ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = styleLeftBold;
-                ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 2, dataIndex + 2, 0, 5, 30);
-                region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 0, 5);
-                ws.AddMergedRegion(region);
-                ws.GetRow(dataIndex + 2).GetCell(0).SetCellValue($"reason原因：{model.OperationReason}");
-                ws.GetRow(dataIndex + 2).GetCell(0).CellStyle = leftStyle;
-                ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 3, dataIndex + 3, 0, 5, 30);
-                region = new CellRangeAddress(dataIndex + 3, dataIndex + 3, 0, 5);
-                ws.AddMergedRegion(region);
-                ws.GetRow(dataIndex + 3).GetCell(0).SetCellValue($"solution处理：{model.OperationHandle}");
-                ws.GetRow(dataIndex + 3).GetCell(0).CellStyle = leftStyle;
-                dataIndex += 3;
+                dataIndex += 1;
+                foreach (var itemoption in operations)
+                {
+                    ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5, 30);
+                    region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 5);
+                    ws.AddMergedRegion(region);
+                    ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue($"reason原因：{itemoption.OperationReason}");
+                    ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = leftStyle;
+                    dataIndex += 1;
+                    ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5, 30);
+                    region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 5);
+                    ws.AddMergedRegion(region);
+                    ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue($"solution处理：{itemoption.OperationHandle}");
+                    ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = leftStyle;
+                    dataIndex += 1;
+                }
+
                 ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5);
                 region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 5);
                 ws.AddMergedRegion(region);
                 ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue("maintenance issue维护问题");
                 ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = styleLeftBold;
-                ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 2, dataIndex + 2, 0, 5, 30);
-                region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 0, 5);
-                ws.AddMergedRegion(region);
-                ws.GetRow(dataIndex + 2).GetCell(0).SetCellValue($"reason原因：{model.MaintenanceReason}");
-                ws.GetRow(dataIndex + 2).GetCell(0).CellStyle = leftStyle;
-                ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 3, dataIndex + 3, 0, 5, 30);
-                region = new CellRangeAddress(dataIndex + 3, dataIndex + 3, 0, 5);
-                ws.AddMergedRegion(region);
-                ws.GetRow(dataIndex + 3).GetCell(0).SetCellValue($"solution处理：{model.MaintenanceHandle}");
-                ws.GetRow(dataIndex + 3).GetCell(0).CellStyle = leftStyle;
-                dataIndex += 3;
+                dataIndex += 1;
+                foreach (var itemmait in maintes)
+                {
+                    ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5, 30);
+                    region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 5);
+                    ws.AddMergedRegion(region);
+                    ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue($"reason原因：{itemmait.MaintenanceReason}");
+                    ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = leftStyle;
+                    dataIndex += 1;
+                    ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5, 30);
+                    region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 5);
+                    ws.AddMergedRegion(region);
+                    ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue($"solution处理：{itemmait.MaintenanceHandle}");
+                    ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = leftStyle;
+                    dataIndex += 1;
+                }
                 #endregion
 
                 ws.PrintSetup.Landscape = false;
@@ -616,7 +492,6 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
 
         #endregion
 
-
         #region 私有方法
 
         /// <summary>
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index 9fc55c34..963148f2 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -12,7 +12,7 @@
   <appSettings>
     <!--连接字符串-->
     <!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
-    <add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
@@ -77,7 +77,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="true" targetFramework="4.6.1"/>
+    <compilation debug="false" targetFramework="4.6.1"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
index 4f4d6b35..0536faf2 100644
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
@@ -105,7 +105,7 @@ namespace FineUIPro.Web.common
                 divCqmsPxNum.InnerHtml = CqmsPxNum.ToString();
 
                 //施工审批量
-                int sgspl = Funs.DB.Solution_CQMSConstructSolution.Where(x => x.ProjectId == ProjectId && x.State == "1").Count();
+                int sgspl = Funs.DB.Solution_CQMSConstructSolution.Where(x => x.ProjectId == ProjectId && x.State == Const.CQMSConstructSolution_Complete).Count();
                 div_sgfaSpl.InnerHtml = sgspl.ToString();
                 GetJD();
                 //质量共检
@@ -405,12 +405,13 @@ namespace FineUIPro.Web.common
         {
             int result = 0;
             //机具报验的到期提醒和过期提醒记录数加一起
-            //机具报验的到期提醒数
-            var num1 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && DateTime.Now < x.NextTestDate && x.ProjectId == ProjectId
-             && ((DateTime)x.NextTestDate).AddDays(-15) < DateTime.Now).Count();
+            ////机具报验的到期提醒数
+            //var num1 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && DateTime.Now < x.NextTestDate && x.ProjectId == ProjectId
+            // && ((DateTime)x.NextTestDate).AddDays(-15) < DateTime.Now).Count();
             //过期提醒记录数
             var num2 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && x.NextTestDate < DateTime.Now && x.ProjectId == ProjectId).Count();
-            result = num1 + num2;
+            //result = num1 + num2;
+            result = num2;
             return result;
         }
 
@@ -636,59 +637,64 @@ namespace FineUIPro.Web.common
             List<double> listdata = new List<double>();
             double result = 0;
             Model.SGGLDB db = Funs.DB;
-            var ndtLists = from x in db.HJGL_FL_NdtList where x.ProjectId == ProjectId select x;
-            ////一次检测合格焊口数
-            //int oneCheckJotNum = (from x in db.HJGL_Batch_NDEItem
-            //                      join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId
-            //                      join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId
-            //                      join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID
-            //                      where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null
-            //                      && a.ProjectId == ProjectId
-            //                      select x.NDEItemID).Count();
-            ////一次检测返修焊口数
-            //int oneCheckRepairJotNum = (from x in db.HJGL_Batch_NDEItem
-            //                            join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId
-            //                            join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId
-            //                            join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID
-            //                            where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null && x.CheckResult == "2"
-            //                            && a.ProjectId == ProjectId
-            //                            select x.NDEItemID).Count();
-            if (ndtLists.Count() > 0)
+            var ndtList = (from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "工艺管道" && x.ProjectId == ProjectId orderby x.CreateDate descending select x).FirstOrDefault();
+            decimal a = 0, b = 0;
+            if (ndtList != null)
             {
-                decimal a = 0, b = 0;
-                foreach (var item in ndtLists)
+                if (ndtList.TotalQuantity.HasValue)
                 {
-                    a += Funs.GetNewDecimalOrZero(item.OneTimeFilmQualifiedAmount);
-                    b += Funs.GetNewDecimalOrZero(item.OneTimeFilmAmount);
+                    a += Math.Floor(ndtList.TotalQuantity.Value * Funs.GetNewDecimalOrZero(ndtList.TotalRate) / 100);
+                    b += ndtList.TotalQuantity.Value;
                 }
-                if (b > 0)
+                if (!string.IsNullOrEmpty(ndtList.TotalRate))
                 {
-                    result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
-
-                    hjallNumber = b.ToString();
-                    hjfinishNumber = a.ToString();
-                    hjzgl = result.ToString();
-                    hjDataValue = (100 - result).ToString();
+                    result = Convert.ToDouble(ndtList.TotalRate);
                 }
             }
-            else
+            if (b > 0)
             {
-                var data = (from x in db.HJGL_FL_Data where x.ProjectId == ProjectId orderby x.CompileDate descending select x).FirstOrDefault();
-                if (data != null)
-                {
-                    decimal a = Funs.GetNewDecimalOrZero(data.OneTimeFilmQualifiedAmount);
-                    decimal b = Funs.GetNewDecimalOrZero(data.OneTimeFilmAmount);
-                    if (b > 0)
-                    {
-                        result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
-
-                        hjallNumber = b.ToString();
-                        hjfinishNumber = a.ToString();
-                        hjzgl = result.ToString();
-                        hjDataValue = (100 - result).ToString();
-                    }
-                }
+                hjallNumber = b.ToString();
+                hjfinishNumber = a.ToString();
+                hjzgl = result.ToString();
+                hjDataValue = (100 - result).ToString();
             }
+            //var ndtLists = from x in db.HJGL_FL_NdtList where x.ProjectId == ProjectId select x;
+            //if (ndtLists.Count() > 0)
+            //{
+            //    decimal a = 0, b = 0;
+            //    foreach (var item in ndtLists)
+            //    {
+            //        a += Funs.GetNewDecimalOrZero(item.OneTimeFilmQualifiedAmount);
+            //        b += Funs.GetNewDecimalOrZero(item.OneTimeFilmAmount);
+            //    }
+            //    if (b > 0)
+            //    {
+            //        result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
+
+            //        hjallNumber = b.ToString();
+            //        hjfinishNumber = a.ToString();
+            //        hjzgl = result.ToString();
+            //        hjDataValue = (100 - result).ToString();
+            //    }
+            //}
+            //else
+            //{
+            //    var data = (from x in db.HJGL_FL_Data where x.ProjectId == ProjectId orderby x.CompileDate descending select x).FirstOrDefault();
+            //    if (data != null)
+            //    {
+            //        decimal a = Funs.GetNewDecimalOrZero(data.OneTimeFilmQualifiedAmount);
+            //        decimal b = Funs.GetNewDecimalOrZero(data.OneTimeFilmAmount);
+            //        if (b > 0)
+            //        {
+            //            result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
+
+            //            hjallNumber = b.ToString();
+            //            hjfinishNumber = a.ToString();
+            //            hjzgl = result.ToString();
+            //            hjDataValue = (100 - result).ToString();
+            //        }
+            //    }
+            //}
         }
 
         #endregion
diff --git a/SGGL/FineUIPro.Web/common/main_new.aspx b/SGGL/FineUIPro.Web/common/main_new.aspx
index fef77127..947da205 100644
--- a/SGGL/FineUIPro.Web/common/main_new.aspx
+++ b/SGGL/FineUIPro.Web/common/main_new.aspx
@@ -100,15 +100,15 @@
                             <div class="y_zlry_label">质量培训累计人员</div>
                             <div class="y_zlry_value" id="divCqmsPxNum" runat="server">0</div>
                         </div>
-                        <div class="y_zlmap y_row js-hover" data-type="QualityProblem">
-                            <div class="zgmap" id="zlmap"></div>
-                            <div class="zgmap" id="ycmap"></div>
-                            <div class="zgmap" id="hjmap"></div>
+                        <div class="y_zlmap y_row js-hover">
+                            <div class="zgmap y_row js-hover" id="zlmap" data-type="QualityProblem"></div>
+                            <div class="zgmap y_row js-hover" id="ycmap" data-type="InspectionManagement"></div>
+                            <div class="zgmap y_row js-hover" id="hjmap" data-type="WeldOneOK"></div>
                         </div>
                     </div>
                 </div>
                 <div class="y_box">
-                    <div class="y_box_label y_image_default">关键事项 <span class="y_more">更多></span></div>
+                    <div class="y_box_label y_image_default">关键事项 <span class="y_more js-hover" data-type="GJSX">更多></span></div>
                     <div class="y_box_main">
                         <!-- <div class="y_aq y_row" style="margin-top: .25rem;">
                             <div class="y_aq_box y_image_default y_row">
@@ -403,7 +403,20 @@
             //    $('iframe').attr('src', '../InterfacePopup/CQMS/QualityProblem.aspx') //质量问题数据
             window.open("../DataShow/QualityProblem.aspx")
 
-        } else if (type == 'ManagerData') {
+        }else if (type == 'InspectionManagement') {
+            //    $('iframe').attr('src', '../InterfacePopup/CQMS/QualityProblem.aspx') //质量共检数据
+            window.open("../DataShow/InspectionManagement.aspx")
+
+        }else if (type == 'WeldOneOK') {
+            //    $('iframe').attr('src', '../InterfacePopup/CQMS/QualityProblem.aspx') //焊接一次合格数据
+            window.open("../DataShow/WeldOneOK.aspx")
+
+        }else if (type == 'GJSX') {
+            //    $('iframe').attr('src', '../InterfacePopup/CQMS/QualityProblem.aspx') //关键事项数据
+            window.open("../DataShow/GJSX.aspx")
+
+        }
+        else if (type == 'ManagerData') {
             //   $('iframe').attr('src', '../InterfacePopup/CQMS/ManagerData.aspx') //管理人员数据
             window.open("../DataShow/QualityPerson.aspx")
 
diff --git a/SGGL/FineUIPro.Web/common/main_new.aspx.cs b/SGGL/FineUIPro.Web/common/main_new.aspx.cs
index b409036d..a72d9fe9 100644
--- a/SGGL/FineUIPro.Web/common/main_new.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/main_new.aspx.cs
@@ -84,18 +84,6 @@ namespace FineUIPro.Web.common
                                  select x).Count();
                 divCqmsPxNum.InnerText = CqmsPxNum.ToString();
 
-                //质量问题
-                getZlwt();
-
-                //质量共检
-                getZlgj();
-
-                //焊接
-                getHj();
-
-                //关键事项
-                getGjsx();
-
                 //在建项目
                 allProjects = ProjectService.GetAllProjectDropDownList();
                 int acount = allProjects.Count();
@@ -112,6 +100,18 @@ namespace FineUIPro.Web.common
                 div_cjrsCount.InnerText = pcount2.ToString();
                 div_wdgcCount.InnerText = pcount3.ToString();
 
+                //质量问题
+                getZlwt();
+
+                //质量共检
+                getZlgj();
+
+                //焊接
+                getHj();
+
+                //关键事项
+                getGjsx();
+
                 //人员信息
                 getSitePerson();
 
@@ -571,41 +571,54 @@ namespace FineUIPro.Web.common
             List<double> listdata = new List<double>();
             double result = 0;
             Model.SGGLDB db = Funs.DB;
-            var ndtLists = from x in db.HJGL_FL_NdtList select x;
-            ////一次检测合格焊口数
-            //int oneCheckJotNum = (from x in db.HJGL_Batch_NDEItem
-            //                      join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId
-            //                      join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId
-            //                      join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID
-            //                      where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null
-            //                      select x.NDEItemID).Count();
-            ////一次检测返修焊口数
-            //int oneCheckRepairJotNum = (from x in db.HJGL_Batch_NDEItem
-            //                            join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId
-            //                            join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId
-            //                            join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID
-            //                            where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null && x.CheckResult == "2" 
-            //                            select x.NDEItemID).Count();
+            var ndtLists = from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName== "工艺管道" select x;
+            decimal a = 0, b = 0;
             if (ndtLists.Count() > 0)
             {
-                decimal a = 0, b = 0;
-                foreach (var item in ndtLists)
+                foreach (var project in allProjects)
                 {
-                    a += Funs.GetNewDecimalOrZero(item.OneTimeFilmQualifiedAmount);
-                    b += Funs.GetNewDecimalOrZero(item.OneTimeFilmAmount);
-                }
-                if (b > 0)
-                {
-                    result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
-
-                    hjallNumber = b.ToString();
-                    hjfinishNumber = a.ToString();
-                    hjzgl = result.ToString();
-                    hjDataValue = (100 - result).ToString();
+                    var ndt = (from x in ndtLists
+                               where x.ProjectId == project.ProjectId
+                               orderby x.CreateDate descending
+                               select x).FirstOrDefault();
+                    if (ndt != null)
+                    {
+                        if (ndt.TotalQuantity.HasValue)
+                        {
+                            a += Math.Floor(ndt.TotalQuantity.Value * Funs.GetNewDecimalOrZero(ndt.TotalRate) / 100);
+                            b += ndt.TotalQuantity.Value;
+                        }
+                    }
                 }
             }
+            if (b > 0)
+            {
+                result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
 
+                hjallNumber = b.ToString();
+                hjfinishNumber = a.ToString();
+                hjzgl = result.ToString();
+                hjDataValue = (100 - result).ToString();
+            }
 
+            //if (ndtLists.Count() > 0)
+            //{
+
+            //    foreach (var item in ndtLists)
+            //    {
+            //        //a += Funs.GetNewDecimalOrZero(item.OneTimeFilmQualifiedAmount);
+            //        //b += Funs.GetNewDecimalOrZero(item.OneTimeFilmAmount);
+            //    }
+            //    if (b > 0)
+            //    {
+            //        result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
+
+            //        hjallNumber = b.ToString();
+            //        hjfinishNumber = a.ToString();
+            //        hjzgl = result.ToString();
+            //        hjDataValue = (100 - result).ToString();
+            //    }
+            //}
         }
 
         #endregion
diff --git a/SGGL/FineUIPro.Web/common/main_new1.aspx b/SGGL/FineUIPro.Web/common/main_new1.aspx
index 50c43a92..54630931 100644
--- a/SGGL/FineUIPro.Web/common/main_new1.aspx
+++ b/SGGL/FineUIPro.Web/common/main_new1.aspx
@@ -142,11 +142,11 @@
                                 <div class="zl-number" style="color: #2BFAFF;"><%=getAllInspectionManagement() %></div>
                             </div>
                             <div class="y_image_default y_column" style="width: 2.7625rem;">
-                                <div class="zl-label">-次合格数量</div>
+                                <div class="zl-label">一次合格数量</div>
                                 <div class="zl-number" style="color: #FF7474;"><%=getIsOnceInspectionManagement() %></div>
                             </div>
                             <div class="y_image_default y_column" style="width: 2.7625rem;">
-                                <div class="zl-label">-次验收合格率</div>
+                                <div class="zl-label">一次验收合格率</div>
                                 <div class="zl-number" style="color: #FFA602;"><%=GetInspectionManagementZgl() %></div>
                             </div>
                         </div>
@@ -171,15 +171,15 @@
                             <div class="hj-box_label">完成达因数</div>
                         </div>
                         <div class="y_column">
-                            <div class="hj-box_number"><%=GetTotalFilmNum() %></div>
+                            <div class="hj-box_number"><%=hjallNumber %></div>
                             <div class="hj-box_label">拍片总数</div>
                         </div>
                         <div class="y_column">
-                            <div class="hj-box_number" style="color: #12CDA2;"><%=GetOKFilmNum() %></div>
+                            <div class="hj-box_number" style="color: #12CDA2;"><%=hjfinishNumber %></div>
                             <div class="hj-box_label">合格片数</div>
                         </div>
                         <div class="y_column">
-                            <div class="hj-box_number" style="color: #FFA602;"><%=GetOKFilmHgl() %></div>
+                            <div class="hj-box_number" style="color: #FFA602;"><%=hjzgl %></div>
                             <div class="hj-box_label">一次拍片合格率</div>
                         </div>
                     </div>
diff --git a/SGGL/FineUIPro.Web/common/main_new1.aspx.cs b/SGGL/FineUIPro.Web/common/main_new1.aspx.cs
index 5c820a79..145b96ff 100644
--- a/SGGL/FineUIPro.Web/common/main_new1.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/main_new1.aspx.cs
@@ -15,6 +15,9 @@ namespace FineUIPro.Web.common
     public partial class main_new1 : PageBase
     {
         protected string divProjectImg;
+        protected string hjallNumber = "0";
+        protected string hjfinishNumber = "0";
+        protected string hjzgl = "0";
         /// <summary>
         /// 页面加载
         /// </summary>
@@ -23,7 +26,7 @@ namespace FineUIPro.Web.common
         protected void Page_Load(object sender, EventArgs e)
         {
             if (!IsPostBack)
-            { 
+            {
                 ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, BLL.Const.ProjectState_1, false);
                 if (this.drpProject.Items.Count > 0)
                 {
@@ -41,6 +44,40 @@ namespace FineUIPro.Web.common
 
                 //资质预警
                 getEarlyWarningCounts();
+
+                //在建项目
+                var allProjects = ProjectService.GetAllProjectDropDownList();
+                //焊接数据
+                double result = 0;
+                Model.SGGLDB db = Funs.DB;
+                var ndtLists = from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "工艺管道" select x;
+                decimal a = 0, b = 0;
+                if (ndtLists.Count() > 0)
+                {
+                    foreach (var project in allProjects)
+                    {
+                        var ndt = (from x in ndtLists
+                                   where x.ProjectId == project.ProjectId
+                                   orderby x.CreateDate descending
+                                   select x).FirstOrDefault();
+                        if (ndt != null)
+                        {
+                            if (ndt.TotalQuantity.HasValue)
+                            {
+                                a += Math.Floor(ndt.TotalQuantity.Value * Funs.GetNewDecimalOrZero(ndt.TotalRate) / 100);
+                                b += ndt.TotalQuantity.Value;
+                            }
+                        }
+                    }
+                }
+                if (b > 0)
+                {
+                    result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
+
+                    hjallNumber = b.ToString();
+                    hjfinishNumber = a.ToString();
+                    hjzgl = result.ToString() + "%";
+                }
             }
         }
 
@@ -57,7 +94,8 @@ namespace FineUIPro.Web.common
                 unitId = thisUnit.UnitId;
             }
             int result = (from x in Funs.DB.Person_CompanyBranchPerson
-                          where x.IsOnJob == true && x.UnitId == unitId
+                          join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+                          where x.IsOnJob == true && x.UnitId == unitId && y.IsCQMS == true
                           select x).Count();
             return result;
         }
@@ -74,7 +112,8 @@ namespace FineUIPro.Web.common
                 unitId = thisUnit.UnitId;
             }
             int result = (from x in Funs.DB.Person_CompanyBranchPerson
-                          where x.IsOnJob == true && x.UnitId != unitId
+                          join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+                          where x.IsOnJob == true && x.UnitId != unitId && y.IsCQMS == true
                           select x).Count();
             return result;
         }
@@ -118,15 +157,17 @@ namespace FineUIPro.Web.common
         /// 机械预警
         /// </summary>
         /// <returns></returns>
-        public static int GetJxyjNum() {
+        public static int GetJxyjNum()
+        {
             int result = 0;
             //机具报验的到期提醒和过期提醒记录数加一起
             //机具报验的到期提醒数
-            var num1 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && DateTime.Now < x.NextTestDate
-             && ((DateTime)x.NextTestDate).AddDays(-15) < DateTime.Now).Count();
+            //var num1 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && DateTime.Now < x.NextTestDate
+            // && ((DateTime)x.NextTestDate).AddDays(-15) < DateTime.Now).Count();
             //过期提醒记录数
-            var num2 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && x.NextTestDate<DateTime.Now).Count();
-            result = num1 + num2;
+            var num2 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && x.NextTestDate < DateTime.Now).Count();
+            //result = num1 + num2;
+            result =  num2;
             return result;
         }
 
@@ -136,9 +177,8 @@ namespace FineUIPro.Web.common
         /// <returns></returns>
         public static int GetTrainPersonNum()
         {
-            DateTime date = DateTime.Now.AddDays(-1);
             int result = (from x in Funs.DB.Comprehensive_InspectionPerson
-                          where x.IsTrain == true && x.CompileDate.Value.Year == date.Year && x.CompileDate.Value.Month == date.Month && x.CompileDate.Value.Day == date.Day
+                          where x.IsTrain == true
                           select x).Count();
             return result;
         }
@@ -149,10 +189,8 @@ namespace FineUIPro.Web.common
         /// <returns></returns>
         public static int GetTechnicalDisclosePersonNum()
         {
-            DateTime date = DateTime.Now.AddDays(-1);
             var result = (from x in Funs.DB.Comprehensive_DesignDetails
-                          where x.DetailsDate.Value.Year == date.Year && x.DetailsDate.Value.Month == date.Month && x.DetailsDate.Value.Day == date.Day
-                          select x.JoinPersonNum??0).ToList().Sum();
+                          select x.JoinPersonNum ?? 0).ToList().Sum();
             var q = Funs.GetNewIntOrZero(result.ToString());
             return q;
         }
@@ -163,9 +201,8 @@ namespace FineUIPro.Web.common
         private void getEarlyWarningCounts()
         {
             int allCount = 0;
-            var getPersonQualitys = from x in Funs.DB.QualityAudit_PersonQuality
-                                    join y in Funs.DB.SitePerson_Person on x.PersonId equals y.PersonId
-                                    where x.LimitDate.HasValue && x.LimitDate < DateTime.Now
+            var getPersonQualitys = from x in Funs.DB.Comprehensive_InspectionPerson
+                                    where x.ValidityDate.HasValue && x.ValidityDate < DateTime.Now && x.IsOnSite == true
                                     select x;
             //// 预警人数
             allCount = getPersonQualitys.Count();
@@ -182,10 +219,12 @@ namespace FineUIPro.Web.common
             int result = 0;
             ;
             //统计所给时间段的全部数量
-            List<Model.View_CQMS_InspectionManagementDetail> managementListSunNumber =
-                BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(
-                    null, null, DateTime.Parse("2001-01-01"), DateTime.Now, false);
-            result = managementListSunNumber.Count;
+            //List<Model.View_CQMS_InspectionManagementDetail> managementListSunNumber =
+            //    BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(
+            //        null, null, DateTime.Parse("2001-01-01"), DateTime.Now, false);
+            var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                        select x).Count();
+            result = num1;
             //int result = (from x in Funs.DB.Check_CheckControl
             //              where x.CheckDate <= DateTime.Now && x.State == "7"
             //              select x).Count();
@@ -199,10 +238,13 @@ namespace FineUIPro.Web.common
         {
             int result = 0;
             //统计所给时间段的合格数量
-            List<Model.View_CQMS_InspectionManagementDetail> managementListOneNumber =
-                BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(
-                    null, null, DateTime.Parse("2001-01-01"), DateTime.Now, true);
-            result = managementListOneNumber.Count;
+            //List<Model.View_CQMS_InspectionManagementDetail> managementListOneNumber =
+            //    BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(
+            //        null, null, DateTime.Parse("2001-01-01"), DateTime.Now, true);
+            var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                        where x.IsOnceQualified == true
+                        select x).Count();
+            result = num2;
 
             //int result = (from x in Funs.DB.Check_CheckControl
             //              where x.CheckDate <= DateTime.Now && x.State != "7"
@@ -365,8 +407,8 @@ namespace FineUIPro.Web.common
             int result = 0;
 
             var getD2 = (from x in Funs.DB.HJGL_FL_Data
-                orderby x.CompileDate descending
-                select x).FirstOrDefault();
+                         orderby x.CompileDate descending
+                         select x).FirstOrDefault();
             if (getD2 != null)
             {
                 result = Funs.GetNewIntOrZero(getD2.OneTimeFilmAmount.Split('.')[0]);
@@ -381,8 +423,8 @@ namespace FineUIPro.Web.common
         {
             int result = 0;
             var getD2 = (from x in Funs.DB.HJGL_FL_Data
-                orderby x.CompileDate descending
-                select x).FirstOrDefault();
+                         orderby x.CompileDate descending
+                         select x).FirstOrDefault();
             if (getD2 != null)
             {
                 result = Funs.GetNewIntOrZero(getD2.OneTimeFilmQualifiedAmount.Split('.')[0]);
@@ -397,7 +439,7 @@ namespace FineUIPro.Web.common
         public static string GetOKFilmHgl()
         {
             string zgl = "0";
-            if (GetOKFilmNum()>0)
+            if (GetOKFilmNum() > 0)
             {
                 zgl = String.Format("{0:N2}", 100.0 * GetOKFilmNum() / GetTotalFilmNum());
             }
@@ -414,32 +456,39 @@ namespace FineUIPro.Web.common
         protected string InspectionManagementOkCount;
         //一次验收合格率
         protected string InspectionManagementOneOkCount;
-        private void getInspectionManagementInfo() {
-            
+        private void getInspectionManagementInfo()
+        {
+
             var q = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId orderby x.SortIndex select x).ToList();
             foreach (var item in q)
             {
                 //获取专业
                 InspectionManagementZy += "'" + item.ProfessionalName + "',";
                 //根据专业获取总计
-                var num1 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
-                            join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
-                            where y.CNProfessionalId == item.CNProfessionalId
-                            select x).ToList().Count;
-                InspectionManagementSumCount += "'"+ num1 + "',";
+                //var num1 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
+                //            join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
+                //            where y.CNProfessionalId == item.CNProfessionalId
+                //            select x).ToList().Count;
+                var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                            where x.CNProfessionalId == item.CNProfessionalId
+                            select x).Count();
+                InspectionManagementSumCount += "'" + num1 + "',";
 
                 //根据专业获取合格数
-                var num2 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
-                            join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
-                            where y.CNProfessionalId == item.CNProfessionalId &&  y.IsOnceQualified==true
-                            select x).ToList().Count;
+                //var num2 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
+                //            join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
+                //            where y.CNProfessionalId == item.CNProfessionalId &&  y.IsOnceQualified==true
+                //            select x).ToList().Count;
+                var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                            where x.CNProfessionalId == item.CNProfessionalId && x.IsOnceQualified == true
+                            select x).Count();
                 InspectionManagementOkCount += "'" + num2 + "',";
 
                 //一次验收合格率
                 var hgl = "0";
-                if (num1>0)
+                if (num1 > 0)
                 {
-                    hgl+= String.Format("{0:N2}", 100.0 * num2 / num1);
+                    hgl += String.Format("{0:N2}", 100.0 * num2 / num1);
                 }
                 InspectionManagementOneOkCount += "'" + hgl + "',";
             }
@@ -457,7 +506,7 @@ namespace FineUIPro.Web.common
         //未整改完成项
         protected string ncrwZgbhx;
         //整改率
-        protected string ncrZgl="0%";
+        protected string ncrZgl = "0%";
 
         //图表数据
         //专业
@@ -468,23 +517,23 @@ namespace FineUIPro.Web.common
             //闭环项 有完成日期的
             //var num1 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.CompleteDate != null).Count();
             //var num2 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.CompleteDate == null).Count(); 
-            var num1 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.Status=="3").Count();
-            var num2 = Funs.DB.Comprehensive_NCRManagement.Where(x => !x.Status.Equals('3') ||x.Status ==null).Count();
+            var num1 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.ImplementationFrontState == "已闭合").Count();
+            var num2 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.ImplementationFrontState == "整改中").Count();
             ncrZgbhx = num1.ToString();
             ncrwZgbhx = num2.ToString();
-            if ((num1 + num2) >0)
+            if ((num1 + num2) > 0)
             {
-                ncrZgl= String.Format("{0:N2}", 100.0 * num1 / (num1 + num2))+"%";
+                ncrZgl = String.Format("{0:N2}", 100.0 * num1 / (num1 + num2)) + "%";
             }
 
             //加载专业
             var list = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId orderby x.SortIndex select x).ToList();
             foreach (var item in list)
             {
-                ncrZy += "'"+item.ProfessionalName+"',";
+                ncrZy += "'" + item.ProfessionalName + "',";
                 //根据专业加载数据量
-                var num3= Funs.DB.Comprehensive_NCRManagement.Where(x => x.CNProfessionalId==item.CNProfessionalId).Count();
-                ncrCount += "'"+num3+"',";
+                var num3 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.CNProfessionalId == item.CNProfessionalId).Count();
+                ncrCount += "'" + num3 + "',";
             }
             ncrZy = ncrZy.TrimEnd(',');
             ncrCount = ncrCount.TrimEnd(',');
@@ -529,7 +578,7 @@ namespace FineUIPro.Web.common
                         {
                             isHiddDefaultImg = true;
                             divProjectImg += string.Format(" <div class=\"swiper-slide\"><img src=\"{0}\"></div>",
-                                atturl.Replace(Funs.RootPath, "/")); 
+                                atturl.Replace(Funs.RootPath, "/"));
                         }
                     }
                 }
@@ -543,10 +592,10 @@ namespace FineUIPro.Web.common
             }
             string jsCode = "var swiperWrapper = document.getElementById('swiper-wrapper');";
             jsCode += "swiperWrapper.innerHTML = '" + divProjectImg + "';";
-            string script2 = " createSwiper();";  
-            PageContext.RegisterStartupScript(jsCode); 
-            PageContext.RegisterStartupScript(script2); 
-             
+            string script2 = " createSwiper();";
+            PageContext.RegisterStartupScript(jsCode);
+            PageContext.RegisterStartupScript(script2);
+
         }
     }
 }
\ No newline at end of file
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 0f1863ef..c8570287 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -2051,6 +2051,12 @@ namespace Model
     partial void InsertRunning_LogManagement(Running_LogManagement instance);
     partial void UpdateRunning_LogManagement(Running_LogManagement instance);
     partial void DeleteRunning_LogManagement(Running_LogManagement instance);
+    partial void InsertRunning_Maintenance(Running_Maintenance instance);
+    partial void UpdateRunning_Maintenance(Running_Maintenance instance);
+    partial void DeleteRunning_Maintenance(Running_Maintenance instance);
+    partial void InsertRunning_Operation(Running_Operation instance);
+    partial void UpdateRunning_Operation(Running_Operation instance);
+    partial void DeleteRunning_Operation(Running_Operation instance);
     partial void InsertSafetyData_SafetyData(SafetyData_SafetyData instance);
     partial void UpdateSafetyData_SafetyData(SafetyData_SafetyData instance);
     partial void DeleteSafetyData_SafetyData(SafetyData_SafetyData instance);
@@ -8077,6 +8083,22 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Running_Maintenance> Running_Maintenance
+		{
+			get
+			{
+				return this.GetTable<Running_Maintenance>();
+			}
+		}
+		
+		public System.Data.Linq.Table<Running_Operation> Running_Operation
+		{
+			get
+			{
+				return this.GetTable<Running_Operation>();
+			}
+		}
+		
 		public System.Data.Linq.Table<SafetyData_SafetyData> SafetyData_SafetyData
 		{
 			get
@@ -88914,6 +88936,8 @@ namespace Model
 		
 		private string _AuditMan;
 		
+		private string _RemarkCode;
+		
 		private EntityRef<Base_CNProfessional> _Base_CNProfessional;
 		
 		private EntityRef<Base_Project> _Base_Project;
@@ -88976,6 +89000,8 @@ namespace Model
     partial void OnStatusChanged();
     partial void OnAuditManChanging(string value);
     partial void OnAuditManChanged();
+    partial void OnRemarkCodeChanging(string value);
+    partial void OnRemarkCodeChanged();
     #endregion
 		
 		public Comprehensive_DataReceivingDoc()
@@ -89499,6 +89525,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")]
+		public string RemarkCode
+		{
+			get
+			{
+				return this._RemarkCode;
+			}
+			set
+			{
+				if ((this._RemarkCode != value))
+				{
+					this.OnRemarkCodeChanging(value);
+					this.SendPropertyChanging();
+					this._RemarkCode = value;
+					this.SendPropertyChanged("RemarkCode");
+					this.OnRemarkCodeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_DataReceivingDoc_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)]
 		public Base_CNProfessional Base_CNProfessional
 		{
@@ -89936,6 +89982,8 @@ namespace Model
 		
 		private string _AuditMan;
 		
+		private string _RemarkCode;
+		
 		private EntityRef<Base_CNProfessional> _Base_CNProfessional;
 		
 		private EntityRef<Base_Project> _Base_Project;
@@ -89982,6 +90030,8 @@ namespace Model
     partial void OnStatusChanged();
     partial void OnAuditManChanging(string value);
     partial void OnAuditManChanged();
+    partial void OnRemarkCodeChanging(string value);
+    partial void OnRemarkCodeChanged();
     #endregion
 		
 		public Comprehensive_DesignChangeOrder()
@@ -90364,6 +90414,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")]
+		public string RemarkCode
+		{
+			get
+			{
+				return this._RemarkCode;
+			}
+			set
+			{
+				if ((this._RemarkCode != value))
+				{
+					this.OnRemarkCodeChanging(value);
+					this.SendPropertyChanging();
+					this._RemarkCode = value;
+					this.SendPropertyChanged("RemarkCode");
+					this.OnRemarkCodeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_DesignChangeOrder_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)]
 		public Base_CNProfessional Base_CNProfessional
 		{
@@ -94044,6 +94114,8 @@ namespace Model
 		
 		private string _AuditMan;
 		
+		private string _RemarkCode;
+		
 		private EntityRef<Base_CNProfessional> _Base_CNProfessional;
 		
 		private EntityRef<Base_Project> _Base_Project;
@@ -94096,6 +94168,8 @@ namespace Model
     partial void OnStatusChanged();
     partial void OnAuditManChanging(string value);
     partial void OnAuditManChanged();
+    partial void OnRemarkCodeChanging(string value);
+    partial void OnRemarkCodeChanged();
     #endregion
 		
 		public Comprehensive_InspectionMachine()
@@ -94538,6 +94612,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")]
+		public string RemarkCode
+		{
+			get
+			{
+				return this._RemarkCode;
+			}
+			set
+			{
+				if ((this._RemarkCode != value))
+				{
+					this.OnRemarkCodeChanging(value);
+					this.SendPropertyChanging();
+					this._RemarkCode = value;
+					this.SendPropertyChanged("RemarkCode");
+					this.OnRemarkCodeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_InspectionMachine_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)]
 		public Base_CNProfessional Base_CNProfessional
 		{
@@ -94963,6 +95057,8 @@ namespace Model
 		
 		private string _AuditMan;
 		
+		private string _RemarkCode;
+		
 		private EntityRef<Base_Post> _Base_Post;
 		
 		private EntityRef<Base_Project> _Base_Project;
@@ -95023,6 +95119,8 @@ namespace Model
     partial void OnStatusChanged();
     partial void OnAuditManChanging(string value);
     partial void OnAuditManChanged();
+    partial void OnRemarkCodeChanging(string value);
+    partial void OnRemarkCodeChanged();
     #endregion
 		
 		public Comprehensive_InspectionPerson()
@@ -95473,6 +95571,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")]
+		public string RemarkCode
+		{
+			get
+			{
+				return this._RemarkCode;
+			}
+			set
+			{
+				if ((this._RemarkCode != value))
+				{
+					this.OnRemarkCodeChanging(value);
+					this.SendPropertyChanging();
+					this._RemarkCode = value;
+					this.SendPropertyChanged("RemarkCode");
+					this.OnRemarkCodeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_InspectionPerson_Base_Post", Storage="_Base_Post", ThisKey="PostId", OtherKey="PostId", IsForeignKey=true)]
 		public Base_Post Base_Post
 		{
@@ -97440,6 +97558,8 @@ namespace Model
 		
 		private string _Measure;
 		
+		private string _RemarkCode;
+		
 		private EntityRef<Sys_User> _Sys_User;
 		
 		private EntityRef<Base_CNProfessional> _Base_CNProfessional;
@@ -97490,6 +97610,8 @@ namespace Model
     partial void OnProblemChanged();
     partial void OnMeasureChanging(string value);
     partial void OnMeasureChanged();
+    partial void OnRemarkCodeChanging(string value);
+    partial void OnRemarkCodeChanged();
     #endregion
 		
 		public Comprehensive_NCRManagement()
@@ -97897,6 +98019,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")]
+		public string RemarkCode
+		{
+			get
+			{
+				return this._RemarkCode;
+			}
+			set
+			{
+				if ((this._RemarkCode != value))
+				{
+					this.OnRemarkCodeChanging(value);
+					this.SendPropertyChanging();
+					this._RemarkCode = value;
+					this.SendPropertyChanged("RemarkCode");
+					this.OnRemarkCodeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_NCRManagement_Sys_User", Storage="_Sys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)]
 		public Sys_User Sys_User
 		{
@@ -101143,6 +101285,8 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _ReportTime;
 		
+		private string _PositionNum;
+		
 		private EntityRef<Sys_User> _Sys_User;
 		
 		private EntityRef<Base_Project> _Base_Project;
@@ -101177,6 +101321,8 @@ namespace Model
     partial void OnAuditManChanged();
     partial void OnReportTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnReportTimeChanged();
+    partial void OnPositionNumChanging(string value);
+    partial void OnPositionNumChanged();
     #endregion
 		
 		public Comprehensive_SpecialEquipment()
@@ -101439,6 +101585,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PositionNum", DbType="NVarChar(50)")]
+		public string PositionNum
+		{
+			get
+			{
+				return this._PositionNum;
+			}
+			set
+			{
+				if ((this._PositionNum != value))
+				{
+					this.OnPositionNumChanging(value);
+					this.SendPropertyChanging();
+					this._PositionNum = value;
+					this.SendPropertyChanged("PositionNum");
+					this.OnPositionNumChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_SpecialEquipment_Sys_User", Storage="_Sys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)]
 		public Sys_User Sys_User
 		{
@@ -315474,52 +315640,12 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _EndData;
 		
-		private System.Nullable<int> _IsDesalinated;
+		private string _Situation;
 		
-		private string _DesalinatedSituation;
-		
-		private string _DesalinatedRemarks;
-		
-		private System.Nullable<int> _IsLoop;
-		
-		private string _LoopSituation;
-		
-		private string _LoopRemarks;
-		
-		private System.Nullable<int> _IsSteam;
-		
-		private string _SteamSituation;
-		
-		private string _SteamRemarks;
-		
-		private System.Nullable<int> _IsAirCompression;
-		
-		private string _AirCompressionSituation;
-		
-		private string _AirCompressionRemarks;
-		
-		private System.Nullable<int> _IsCompoundAmmonia;
-		
-		private string _CompoundAmmoniaSituation;
-		
-		private string _CompoundAmmoniaRemarks;
-		
-		private System.Nullable<int> _IsUrea;
-		
-		private string _UreaSituation;
-		
-		private string _UreaRemarks;
+		private string _Remarks;
 		
 		private string _HandoverCare;
 		
-		private string _OperationReason;
-		
-		private string _OperationHandle;
-		
-		private string _MaintenanceReason;
-		
-		private string _MaintenanceHandle;
-		
 		private string _AddUser;
 		
 		private System.Nullable<System.DateTime> _AddTime;
@@ -315552,52 +315678,12 @@ namespace Model
     partial void OnStartDataChanged();
     partial void OnEndDataChanging(System.Nullable<System.DateTime> value);
     partial void OnEndDataChanged();
-    partial void OnIsDesalinatedChanging(System.Nullable<int> value);
-    partial void OnIsDesalinatedChanged();
-    partial void OnDesalinatedSituationChanging(string value);
-    partial void OnDesalinatedSituationChanged();
-    partial void OnDesalinatedRemarksChanging(string value);
-    partial void OnDesalinatedRemarksChanged();
-    partial void OnIsLoopChanging(System.Nullable<int> value);
-    partial void OnIsLoopChanged();
-    partial void OnLoopSituationChanging(string value);
-    partial void OnLoopSituationChanged();
-    partial void OnLoopRemarksChanging(string value);
-    partial void OnLoopRemarksChanged();
-    partial void OnIsSteamChanging(System.Nullable<int> value);
-    partial void OnIsSteamChanged();
-    partial void OnSteamSituationChanging(string value);
-    partial void OnSteamSituationChanged();
-    partial void OnSteamRemarksChanging(string value);
-    partial void OnSteamRemarksChanged();
-    partial void OnIsAirCompressionChanging(System.Nullable<int> value);
-    partial void OnIsAirCompressionChanged();
-    partial void OnAirCompressionSituationChanging(string value);
-    partial void OnAirCompressionSituationChanged();
-    partial void OnAirCompressionRemarksChanging(string value);
-    partial void OnAirCompressionRemarksChanged();
-    partial void OnIsCompoundAmmoniaChanging(System.Nullable<int> value);
-    partial void OnIsCompoundAmmoniaChanged();
-    partial void OnCompoundAmmoniaSituationChanging(string value);
-    partial void OnCompoundAmmoniaSituationChanged();
-    partial void OnCompoundAmmoniaRemarksChanging(string value);
-    partial void OnCompoundAmmoniaRemarksChanged();
-    partial void OnIsUreaChanging(System.Nullable<int> value);
-    partial void OnIsUreaChanged();
-    partial void OnUreaSituationChanging(string value);
-    partial void OnUreaSituationChanged();
-    partial void OnUreaRemarksChanging(string value);
-    partial void OnUreaRemarksChanged();
+    partial void OnSituationChanging(string value);
+    partial void OnSituationChanged();
+    partial void OnRemarksChanging(string value);
+    partial void OnRemarksChanged();
     partial void OnHandoverCareChanging(string value);
     partial void OnHandoverCareChanged();
-    partial void OnOperationReasonChanging(string value);
-    partial void OnOperationReasonChanged();
-    partial void OnOperationHandleChanging(string value);
-    partial void OnOperationHandleChanged();
-    partial void OnMaintenanceReasonChanging(string value);
-    partial void OnMaintenanceReasonChanged();
-    partial void OnMaintenanceHandleChanging(string value);
-    partial void OnMaintenanceHandleChanged();
     partial void OnAddUserChanging(string value);
     partial void OnAddUserChanged();
     partial void OnAddTimeChanging(System.Nullable<System.DateTime> value);
@@ -315831,362 +315917,42 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsDesalinated", DbType="Int")]
-		public System.Nullable<int> IsDesalinated
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Situation", DbType="VarChar(1000)")]
+		public string Situation
 		{
 			get
 			{
-				return this._IsDesalinated;
+				return this._Situation;
 			}
 			set
 			{
-				if ((this._IsDesalinated != value))
+				if ((this._Situation != value))
 				{
-					this.OnIsDesalinatedChanging(value);
+					this.OnSituationChanging(value);
 					this.SendPropertyChanging();
-					this._IsDesalinated = value;
-					this.SendPropertyChanged("IsDesalinated");
-					this.OnIsDesalinatedChanged();
+					this._Situation = value;
+					this.SendPropertyChanged("Situation");
+					this.OnSituationChanged();
 				}
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DesalinatedSituation", DbType="VarChar(1000)")]
-		public string DesalinatedSituation
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="VarChar(1000)")]
+		public string Remarks
 		{
 			get
 			{
-				return this._DesalinatedSituation;
+				return this._Remarks;
 			}
 			set
 			{
-				if ((this._DesalinatedSituation != value))
+				if ((this._Remarks != value))
 				{
-					this.OnDesalinatedSituationChanging(value);
+					this.OnRemarksChanging(value);
 					this.SendPropertyChanging();
-					this._DesalinatedSituation = value;
-					this.SendPropertyChanged("DesalinatedSituation");
-					this.OnDesalinatedSituationChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DesalinatedRemarks", DbType="VarChar(1000)")]
-		public string DesalinatedRemarks
-		{
-			get
-			{
-				return this._DesalinatedRemarks;
-			}
-			set
-			{
-				if ((this._DesalinatedRemarks != value))
-				{
-					this.OnDesalinatedRemarksChanging(value);
-					this.SendPropertyChanging();
-					this._DesalinatedRemarks = value;
-					this.SendPropertyChanged("DesalinatedRemarks");
-					this.OnDesalinatedRemarksChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsLoop", DbType="Int")]
-		public System.Nullable<int> IsLoop
-		{
-			get
-			{
-				return this._IsLoop;
-			}
-			set
-			{
-				if ((this._IsLoop != value))
-				{
-					this.OnIsLoopChanging(value);
-					this.SendPropertyChanging();
-					this._IsLoop = value;
-					this.SendPropertyChanged("IsLoop");
-					this.OnIsLoopChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LoopSituation", DbType="VarChar(1000)")]
-		public string LoopSituation
-		{
-			get
-			{
-				return this._LoopSituation;
-			}
-			set
-			{
-				if ((this._LoopSituation != value))
-				{
-					this.OnLoopSituationChanging(value);
-					this.SendPropertyChanging();
-					this._LoopSituation = value;
-					this.SendPropertyChanged("LoopSituation");
-					this.OnLoopSituationChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LoopRemarks", DbType="VarChar(1000)")]
-		public string LoopRemarks
-		{
-			get
-			{
-				return this._LoopRemarks;
-			}
-			set
-			{
-				if ((this._LoopRemarks != value))
-				{
-					this.OnLoopRemarksChanging(value);
-					this.SendPropertyChanging();
-					this._LoopRemarks = value;
-					this.SendPropertyChanged("LoopRemarks");
-					this.OnLoopRemarksChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSteam", DbType="Int")]
-		public System.Nullable<int> IsSteam
-		{
-			get
-			{
-				return this._IsSteam;
-			}
-			set
-			{
-				if ((this._IsSteam != value))
-				{
-					this.OnIsSteamChanging(value);
-					this.SendPropertyChanging();
-					this._IsSteam = value;
-					this.SendPropertyChanged("IsSteam");
-					this.OnIsSteamChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SteamSituation", DbType="VarChar(1000)")]
-		public string SteamSituation
-		{
-			get
-			{
-				return this._SteamSituation;
-			}
-			set
-			{
-				if ((this._SteamSituation != value))
-				{
-					this.OnSteamSituationChanging(value);
-					this.SendPropertyChanging();
-					this._SteamSituation = value;
-					this.SendPropertyChanged("SteamSituation");
-					this.OnSteamSituationChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SteamRemarks", DbType="VarChar(1000)")]
-		public string SteamRemarks
-		{
-			get
-			{
-				return this._SteamRemarks;
-			}
-			set
-			{
-				if ((this._SteamRemarks != value))
-				{
-					this.OnSteamRemarksChanging(value);
-					this.SendPropertyChanging();
-					this._SteamRemarks = value;
-					this.SendPropertyChanged("SteamRemarks");
-					this.OnSteamRemarksChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsAirCompression", DbType="Int")]
-		public System.Nullable<int> IsAirCompression
-		{
-			get
-			{
-				return this._IsAirCompression;
-			}
-			set
-			{
-				if ((this._IsAirCompression != value))
-				{
-					this.OnIsAirCompressionChanging(value);
-					this.SendPropertyChanging();
-					this._IsAirCompression = value;
-					this.SendPropertyChanged("IsAirCompression");
-					this.OnIsAirCompressionChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AirCompressionSituation", DbType="VarChar(1000)")]
-		public string AirCompressionSituation
-		{
-			get
-			{
-				return this._AirCompressionSituation;
-			}
-			set
-			{
-				if ((this._AirCompressionSituation != value))
-				{
-					this.OnAirCompressionSituationChanging(value);
-					this.SendPropertyChanging();
-					this._AirCompressionSituation = value;
-					this.SendPropertyChanged("AirCompressionSituation");
-					this.OnAirCompressionSituationChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AirCompressionRemarks", DbType="VarChar(1000)")]
-		public string AirCompressionRemarks
-		{
-			get
-			{
-				return this._AirCompressionRemarks;
-			}
-			set
-			{
-				if ((this._AirCompressionRemarks != value))
-				{
-					this.OnAirCompressionRemarksChanging(value);
-					this.SendPropertyChanging();
-					this._AirCompressionRemarks = value;
-					this.SendPropertyChanged("AirCompressionRemarks");
-					this.OnAirCompressionRemarksChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCompoundAmmonia", DbType="Int")]
-		public System.Nullable<int> IsCompoundAmmonia
-		{
-			get
-			{
-				return this._IsCompoundAmmonia;
-			}
-			set
-			{
-				if ((this._IsCompoundAmmonia != value))
-				{
-					this.OnIsCompoundAmmoniaChanging(value);
-					this.SendPropertyChanging();
-					this._IsCompoundAmmonia = value;
-					this.SendPropertyChanged("IsCompoundAmmonia");
-					this.OnIsCompoundAmmoniaChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompoundAmmoniaSituation", DbType="VarChar(1000)")]
-		public string CompoundAmmoniaSituation
-		{
-			get
-			{
-				return this._CompoundAmmoniaSituation;
-			}
-			set
-			{
-				if ((this._CompoundAmmoniaSituation != value))
-				{
-					this.OnCompoundAmmoniaSituationChanging(value);
-					this.SendPropertyChanging();
-					this._CompoundAmmoniaSituation = value;
-					this.SendPropertyChanged("CompoundAmmoniaSituation");
-					this.OnCompoundAmmoniaSituationChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompoundAmmoniaRemarks", DbType="VarChar(1000)")]
-		public string CompoundAmmoniaRemarks
-		{
-			get
-			{
-				return this._CompoundAmmoniaRemarks;
-			}
-			set
-			{
-				if ((this._CompoundAmmoniaRemarks != value))
-				{
-					this.OnCompoundAmmoniaRemarksChanging(value);
-					this.SendPropertyChanging();
-					this._CompoundAmmoniaRemarks = value;
-					this.SendPropertyChanged("CompoundAmmoniaRemarks");
-					this.OnCompoundAmmoniaRemarksChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUrea", DbType="Int")]
-		public System.Nullable<int> IsUrea
-		{
-			get
-			{
-				return this._IsUrea;
-			}
-			set
-			{
-				if ((this._IsUrea != value))
-				{
-					this.OnIsUreaChanging(value);
-					this.SendPropertyChanging();
-					this._IsUrea = value;
-					this.SendPropertyChanged("IsUrea");
-					this.OnIsUreaChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UreaSituation", DbType="VarChar(1000)")]
-		public string UreaSituation
-		{
-			get
-			{
-				return this._UreaSituation;
-			}
-			set
-			{
-				if ((this._UreaSituation != value))
-				{
-					this.OnUreaSituationChanging(value);
-					this.SendPropertyChanging();
-					this._UreaSituation = value;
-					this.SendPropertyChanged("UreaSituation");
-					this.OnUreaSituationChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UreaRemarks", DbType="VarChar(1000)")]
-		public string UreaRemarks
-		{
-			get
-			{
-				return this._UreaRemarks;
-			}
-			set
-			{
-				if ((this._UreaRemarks != value))
-				{
-					this.OnUreaRemarksChanging(value);
-					this.SendPropertyChanging();
-					this._UreaRemarks = value;
-					this.SendPropertyChanged("UreaRemarks");
-					this.OnUreaRemarksChanged();
+					this._Remarks = value;
+					this.SendPropertyChanged("Remarks");
+					this.OnRemarksChanged();
 				}
 			}
 		}
@@ -316211,42 +315977,264 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OperationReason", DbType="VarChar(1000)")]
-		public string OperationReason
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")]
+		public string AddUser
 		{
 			get
 			{
-				return this._OperationReason;
+				return this._AddUser;
 			}
 			set
 			{
-				if ((this._OperationReason != value))
+				if ((this._AddUser != value))
 				{
-					this.OnOperationReasonChanging(value);
+					this.OnAddUserChanging(value);
 					this.SendPropertyChanging();
-					this._OperationReason = value;
-					this.SendPropertyChanged("OperationReason");
-					this.OnOperationReasonChanged();
+					this._AddUser = value;
+					this.SendPropertyChanged("AddUser");
+					this.OnAddUserChanged();
 				}
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OperationHandle", DbType="VarChar(1000)")]
-		public string OperationHandle
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> AddTime
 		{
 			get
 			{
-				return this._OperationHandle;
+				return this._AddTime;
 			}
 			set
 			{
-				if ((this._OperationHandle != value))
+				if ((this._AddTime != value))
 				{
-					this.OnOperationHandleChanging(value);
+					this.OnAddTimeChanging(value);
 					this.SendPropertyChanging();
-					this._OperationHandle = value;
-					this.SendPropertyChanged("OperationHandle");
-					this.OnOperationHandleChanged();
+					this._AddTime = value;
+					this.SendPropertyChanged("AddTime");
+					this.OnAddTimeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort", DbType="Int")]
+		public System.Nullable<int> Sort
+		{
+			get
+			{
+				return this._Sort;
+			}
+			set
+			{
+				if ((this._Sort != value))
+				{
+					this.OnSortChanging(value);
+					this.SendPropertyChanging();
+					this._Sort = value;
+					this.SendPropertyChanged("Sort");
+					this.OnSortChanged();
+				}
+			}
+		}
+		
+		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.Running_Maintenance")]
+	public partial class Running_Maintenance : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _MaintenanceId;
+		
+		private string _RunningId;
+		
+		private string _ProjectId;
+		
+		private string _InstallationId;
+		
+		private string _ProcessesId;
+		
+		private string _SystemId;
+		
+		private string _MaintenanceReason;
+		
+		private string _MaintenanceHandle;
+		
+		private string _AddUser;
+		
+		private System.Nullable<System.DateTime> _AddTime;
+		
+		private System.Nullable<int> _Sort;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnMaintenanceIdChanging(string value);
+    partial void OnMaintenanceIdChanged();
+    partial void OnRunningIdChanging(string value);
+    partial void OnRunningIdChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
+    partial void OnInstallationIdChanging(string value);
+    partial void OnInstallationIdChanged();
+    partial void OnProcessesIdChanging(string value);
+    partial void OnProcessesIdChanged();
+    partial void OnSystemIdChanging(string value);
+    partial void OnSystemIdChanged();
+    partial void OnMaintenanceReasonChanging(string value);
+    partial void OnMaintenanceReasonChanged();
+    partial void OnMaintenanceHandleChanging(string value);
+    partial void OnMaintenanceHandleChanged();
+    partial void OnAddUserChanging(string value);
+    partial void OnAddUserChanged();
+    partial void OnAddTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnAddTimeChanged();
+    partial void OnSortChanging(System.Nullable<int> value);
+    partial void OnSortChanged();
+    #endregion
+		
+		public Running_Maintenance()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaintenanceId", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string MaintenanceId
+		{
+			get
+			{
+				return this._MaintenanceId;
+			}
+			set
+			{
+				if ((this._MaintenanceId != value))
+				{
+					this.OnMaintenanceIdChanging(value);
+					this.SendPropertyChanging();
+					this._MaintenanceId = value;
+					this.SendPropertyChanged("MaintenanceId");
+					this.OnMaintenanceIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RunningId", DbType="VarChar(50)")]
+		public string RunningId
+		{
+			get
+			{
+				return this._RunningId;
+			}
+			set
+			{
+				if ((this._RunningId != value))
+				{
+					this.OnRunningIdChanging(value);
+					this.SendPropertyChanging();
+					this._RunningId = value;
+					this.SendPropertyChanged("RunningId");
+					this.OnRunningIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="VarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this.OnProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectId = value;
+					this.SendPropertyChanged("ProjectId");
+					this.OnProjectIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationId", DbType="VarChar(50)")]
+		public string InstallationId
+		{
+			get
+			{
+				return this._InstallationId;
+			}
+			set
+			{
+				if ((this._InstallationId != value))
+				{
+					this.OnInstallationIdChanging(value);
+					this.SendPropertyChanging();
+					this._InstallationId = value;
+					this.SendPropertyChanged("InstallationId");
+					this.OnInstallationIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProcessesId", DbType="VarChar(50)")]
+		public string ProcessesId
+		{
+			get
+			{
+				return this._ProcessesId;
+			}
+			set
+			{
+				if ((this._ProcessesId != value))
+				{
+					this.OnProcessesIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProcessesId = value;
+					this.SendPropertyChanged("ProcessesId");
+					this.OnProcessesIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SystemId", DbType="VarChar(50)")]
+		public string SystemId
+		{
+			get
+			{
+				return this._SystemId;
+			}
+			set
+			{
+				if ((this._SystemId != value))
+				{
+					this.OnSystemIdChanging(value);
+					this.SendPropertyChanging();
+					this._SystemId = value;
+					this.SendPropertyChanged("SystemId");
+					this.OnSystemIdChanged();
 				}
 			}
 		}
@@ -316372,6 +316360,308 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Running_Operation")]
+	public partial class Running_Operation : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _OperationId;
+		
+		private string _RunningId;
+		
+		private string _ProjectId;
+		
+		private string _InstallationId;
+		
+		private string _ProcessesId;
+		
+		private string _SystemId;
+		
+		private string _OperationReason;
+		
+		private string _OperationHandle;
+		
+		private string _AddUser;
+		
+		private System.Nullable<System.DateTime> _AddTime;
+		
+		private System.Nullable<int> _Sort;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnOperationIdChanging(string value);
+    partial void OnOperationIdChanged();
+    partial void OnRunningIdChanging(string value);
+    partial void OnRunningIdChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
+    partial void OnInstallationIdChanging(string value);
+    partial void OnInstallationIdChanged();
+    partial void OnProcessesIdChanging(string value);
+    partial void OnProcessesIdChanged();
+    partial void OnSystemIdChanging(string value);
+    partial void OnSystemIdChanged();
+    partial void OnOperationReasonChanging(string value);
+    partial void OnOperationReasonChanged();
+    partial void OnOperationHandleChanging(string value);
+    partial void OnOperationHandleChanged();
+    partial void OnAddUserChanging(string value);
+    partial void OnAddUserChanged();
+    partial void OnAddTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnAddTimeChanged();
+    partial void OnSortChanging(System.Nullable<int> value);
+    partial void OnSortChanged();
+    #endregion
+		
+		public Running_Operation()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OperationId", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string OperationId
+		{
+			get
+			{
+				return this._OperationId;
+			}
+			set
+			{
+				if ((this._OperationId != value))
+				{
+					this.OnOperationIdChanging(value);
+					this.SendPropertyChanging();
+					this._OperationId = value;
+					this.SendPropertyChanged("OperationId");
+					this.OnOperationIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RunningId", DbType="VarChar(50)")]
+		public string RunningId
+		{
+			get
+			{
+				return this._RunningId;
+			}
+			set
+			{
+				if ((this._RunningId != value))
+				{
+					this.OnRunningIdChanging(value);
+					this.SendPropertyChanging();
+					this._RunningId = value;
+					this.SendPropertyChanged("RunningId");
+					this.OnRunningIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="VarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this.OnProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectId = value;
+					this.SendPropertyChanged("ProjectId");
+					this.OnProjectIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationId", DbType="VarChar(50)")]
+		public string InstallationId
+		{
+			get
+			{
+				return this._InstallationId;
+			}
+			set
+			{
+				if ((this._InstallationId != value))
+				{
+					this.OnInstallationIdChanging(value);
+					this.SendPropertyChanging();
+					this._InstallationId = value;
+					this.SendPropertyChanged("InstallationId");
+					this.OnInstallationIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProcessesId", DbType="VarChar(50)")]
+		public string ProcessesId
+		{
+			get
+			{
+				return this._ProcessesId;
+			}
+			set
+			{
+				if ((this._ProcessesId != value))
+				{
+					this.OnProcessesIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProcessesId = value;
+					this.SendPropertyChanged("ProcessesId");
+					this.OnProcessesIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SystemId", DbType="VarChar(50)")]
+		public string SystemId
+		{
+			get
+			{
+				return this._SystemId;
+			}
+			set
+			{
+				if ((this._SystemId != value))
+				{
+					this.OnSystemIdChanging(value);
+					this.SendPropertyChanging();
+					this._SystemId = value;
+					this.SendPropertyChanged("SystemId");
+					this.OnSystemIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OperationReason", DbType="VarChar(1000)")]
+		public string OperationReason
+		{
+			get
+			{
+				return this._OperationReason;
+			}
+			set
+			{
+				if ((this._OperationReason != value))
+				{
+					this.OnOperationReasonChanging(value);
+					this.SendPropertyChanging();
+					this._OperationReason = value;
+					this.SendPropertyChanged("OperationReason");
+					this.OnOperationReasonChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OperationHandle", DbType="VarChar(1000)")]
+		public string OperationHandle
+		{
+			get
+			{
+				return this._OperationHandle;
+			}
+			set
+			{
+				if ((this._OperationHandle != value))
+				{
+					this.OnOperationHandleChanging(value);
+					this.SendPropertyChanging();
+					this._OperationHandle = value;
+					this.SendPropertyChanged("OperationHandle");
+					this.OnOperationHandleChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")]
+		public string AddUser
+		{
+			get
+			{
+				return this._AddUser;
+			}
+			set
+			{
+				if ((this._AddUser != value))
+				{
+					this.OnAddUserChanging(value);
+					this.SendPropertyChanging();
+					this._AddUser = value;
+					this.SendPropertyChanged("AddUser");
+					this.OnAddUserChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> AddTime
+		{
+			get
+			{
+				return this._AddTime;
+			}
+			set
+			{
+				if ((this._AddTime != value))
+				{
+					this.OnAddTimeChanging(value);
+					this.SendPropertyChanging();
+					this._AddTime = value;
+					this.SendPropertyChanged("AddTime");
+					this.OnAddTimeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort", DbType="Int")]
+		public System.Nullable<int> Sort
+		{
+			get
+			{
+				return this._Sort;
+			}
+			set
+			{
+				if ((this._Sort != value))
+				{
+					this.OnSortChanging(value);
+					this.SendPropertyChanging();
+					this._Sort = value;
+					this.SendPropertyChanged("Sort");
+					this.OnSortChanged();
+				}
+			}
+		}
+		
+		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.SafetyData_SafetyData")]
 	public partial class SafetyData_SafetyData : INotifyPropertyChanging, INotifyPropertyChanged
 	{
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 5fe155da..bd497c6b 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />