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-18-phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-04-18-phf.sql
new file mode 100644
index 00000000..4b66579e
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-04-18-phf.sql
@@ -0,0 +1,2 @@
+update Comprehensive_DesignChangeOrder set ImplementationFrontState='�����' where ImplementationFrontState like'%���%';
+update Comprehensive_DesignChangeOrder set ImplementationFrontState='ʵʩ��' where ImplementationFrontState !='�����';
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/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..841ddca2 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -3250,6 +3250,11 @@ namespace BLL
         /// 培训记录导入模板原始虚拟路径
         /// </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/DesignChangeOrderEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx
index 70b4acc8..6cdfa08b 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx
@@ -42,7 +42,12 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtImplementationFrontState" runat="server" Label="执行情况" MaxLength="50" LabelAlign="right"></f:TextBox>
+                        <%--<f:TextBox ID="txtImplementationFrontState" runat="server" Label="执行情况" MaxLength="50" LabelAlign="right"></f:TextBox>--%>
+                         <f:DropDownList ID="drpImplementationFrontState" runat="server" Label="执行情况" LabelAlign="right">
+                             <f:ListItem  Value="实施中" Text="实施中" Selected="true"/>
+                             <f:ListItem  Value="已完成" Text="已完成"/>
+                         </f:DropDownList>
+
                         <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="施工完成日期" ID="txtCompleteDate" LabelWidth="120px"
                             LabelAlign="right">
                         </f:DatePicker>
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs
index 26ea6252..eb66fad6 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs
@@ -75,8 +75,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     {
                         this.txtCompleteDate.Text = string.Format("{0:yyyy-MM-dd}", designChangeOrder.CompleteDate);
                     }
-                    this.txtImplementationFrontState.Text = designChangeOrder.ImplementationFrontState;
-
+                    //this.txtImplementationFrontState.Text = designChangeOrder.ImplementationFrontState;
+                    this.drpImplementationFrontState.SelectedValue= designChangeOrder.ImplementationFrontState;
 
 
                     var currApprove = DesignChangeOrderApproveService.GetCurrentApprove(designChangeOrder.DesignChangeOrderId);
@@ -192,7 +192,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             designChangeOrder.IssuedDate = Funs.GetNewDateTime(this.txtIssuedDate.Text);
             designChangeOrder.ApprovalDate = Funs.GetNewDateTime(this.txtApprovalDate.Text);
             designChangeOrder.CompleteDate = Funs.GetNewDateTime(this.txtCompleteDate.Text);
-            designChangeOrder.ImplementationFrontState = this.txtImplementationFrontState.Text.Trim();
+            designChangeOrder.ImplementationFrontState = this.drpImplementationFrontState.SelectedValue;
             if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
             {
                 designChangeOrder.AuditMan = drpAudit.SelectedValue;
@@ -273,7 +273,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             designChangeOrder.IssuedDate = Funs.GetNewDateTime(this.txtIssuedDate.Text);
             designChangeOrder.ApprovalDate = Funs.GetNewDateTime(this.txtApprovalDate.Text);
             designChangeOrder.CompleteDate = Funs.GetNewDateTime(this.txtCompleteDate.Text);
-            designChangeOrder.ImplementationFrontState = this.txtImplementationFrontState.Text.Trim();
+            designChangeOrder.ImplementationFrontState = this.drpImplementationFrontState.SelectedValue;
             if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
             {
                 designChangeOrder.AuditMan = drpAudit.SelectedValue;
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.designer.cs
index 0bf36a10..5f560bc1 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.designer.cs
@@ -114,13 +114,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         protected global::FineUIPro.DatePicker txtApprovalDate;
 
         /// <summary>
-        /// txtImplementationFrontState 控件。
+        /// drpImplementationFrontState 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtImplementationFrontState;
+        protected global::FineUIPro.DropDownList drpImplementationFrontState;
 
         /// <summary>
         /// txtCompleteDate 控件。
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/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..3501480b 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], 13);
                 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,40 +230,72 @@ 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 + "]错误！" + "|";
                         }
                     }
                 }
@@ -366,7 +403,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL2(ds.Tables[0], 10);
+                AddDatasetToSQL2(ds.Tables[0], 13);
             }
             catch (Exception ex)
             {
@@ -405,6 +442,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++)
                 {
                     Model.Comprehensive_NCRManagement oldViewInfo = new Model.Comprehensive_NCRManagement();
@@ -426,20 +468,27 @@ 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.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.ResponsibleMan = pds.Rows[i][9].ToString().Trim();
                         BLL.NCRManagementService.AddNCRManagement(des);
                     }
                 }
@@ -454,7 +503,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/CQMS/ManageReportNew/MonthReport.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs
index 5bae9b6e..b8506108 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs
@@ -684,8 +684,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     checkStatisc.TotalCheckNum = totalManagementList.Count();
                     checkStatisc.OKNum = managementList.Count(x => x.ApprovalDate != null);
                     checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ApprovalDate != null);
-                    checkStatisc.OneOKRate = managementList.Count(x => x.Status == "3").ToString();       //当期完成数
-                    checkStatisc.TotalOneOKRate = totalManagementList.Count(x => x.Status == "3").ToString();    //累计完成数
+                    checkStatisc.OneOKRate = managementList.Count(x => x.ImplementationFrontState == "已完成").ToString();       //当期完成数
+                    checkStatisc.TotalOneOKRate = totalManagementList.Count(x => x.ImplementationFrontState == "已完成").ToString();    //累计完成数
 
                     StatisticsList.Add(checkStatisc);
                     Quantity1Sum += checkStatisc.CheckNum;
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
index 7f406d21..438065e8 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
@@ -830,8 +830,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 checkStatisc.TotalCheckNum = totalManagementList.Count();
                 checkStatisc.OKNum = managementList.Count(x => x.ApprovalDate != null);
                 checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ApprovalDate != null);
-                checkStatisc.OneOKRate = managementList.Count(x => x.Status == "3").ToString();       //当期完成数
-                checkStatisc.TotalOneOKRate = totalManagementList.Count(x => x.Status == "3").ToString();    //累计完成数
+                checkStatisc.OneOKRate = managementList.Count(x => x.ImplementationFrontState == "已完成").ToString();       //当期完成数
+                checkStatisc.TotalOneOKRate = totalManagementList.Count(x => x.ImplementationFrontState == "已完成").ToString();    //累计完成数
 
                 StatisticsList.Add(checkStatisc);
                 Quantity1Sum += checkStatisc.CheckNum;
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..ff2cba5f 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 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 c51fd734..7859e742 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/Word/CQMS/项目质量月报.doc b/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报.doc
index 56814ef9..d896d188 100644
Binary files a/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报.doc and b/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报.doc 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/Web.config b/SGGL/FineUIPro.Web/Web.config
index 9fc55c34..eafda425 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -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/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..9f7bd7b4 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,14 +157,15 @@ 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 num2 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && x.NextTestDate<DateTime.Now).Count();
+            var num2 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && x.NextTestDate < DateTime.Now).Count();
             result = num1 + num2;
             return result;
         }
@@ -136,9 +176,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 +188,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;
         }
@@ -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..c3200bad 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -1457,6 +1457,9 @@ namespace Model
     partial void InsertManager_Month_CheckC(Manager_Month_CheckC instance);
     partial void UpdateManager_Month_CheckC(Manager_Month_CheckC instance);
     partial void DeleteManager_Month_CheckC(Manager_Month_CheckC instance);
+    partial void InsertManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance);
+    partial void UpdateManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance);
+    partial void DeleteManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance);
     partial void InsertManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance);
     partial void UpdateManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance);
     partial void DeleteManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance);
@@ -2015,6 +2018,9 @@ namespace Model
     partial void InsertReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance);
     partial void UpdateReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance);
     partial void DeleteReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance);
+    partial void InsertReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance);
+    partial void UpdateReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance);
+    partial void DeleteReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance);
     partial void InsertReport_CqmsTarget(Report_CqmsTarget instance);
     partial void UpdateReport_CqmsTarget(Report_CqmsTarget instance);
     partial void DeleteReport_CqmsTarget(Report_CqmsTarget instance);
@@ -6493,6 +6499,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Manager_Month_ComplianceObligations> Manager_Month_ComplianceObligations
+		{
+			get
+			{
+				return this.GetTable<Manager_Month_ComplianceObligations>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Manager_Month_ComplianceObligationsC> Manager_Month_ComplianceObligationsC
 		{
 			get
@@ -7981,6 +7995,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Report_CQMS_ProblemHandle> Report_CQMS_ProblemHandle
+		{
+			get
+			{
+				return this.GetTable<Report_CQMS_ProblemHandle>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Report_CqmsTarget> Report_CqmsTarget
 		{
 			get
@@ -21530,8 +21552,6 @@ namespace Model
 		
 		private string _CodeRule;
 		
-		private EntitySet<Doc_DocManage> _Doc_DocManage;
-		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -21548,7 +21568,6 @@ namespace Model
 		
 		public Base_DocType()
 		{
-			this._Doc_DocManage = new EntitySet<Doc_DocManage>(new Action<Doc_DocManage>(this.attach_Doc_DocManage), new Action<Doc_DocManage>(this.detach_Doc_DocManage));
 			OnCreated();
 		}
 		
@@ -21632,19 +21651,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_DocType", Storage="_Doc_DocManage", ThisKey="DocTypeId", OtherKey="DocTypeId", DeleteRule="NO ACTION")]
-		public EntitySet<Doc_DocManage> Doc_DocManage
-		{
-			get
-			{
-				return this._Doc_DocManage;
-			}
-			set
-			{
-				this._Doc_DocManage.Assign(value);
-			}
-		}
-		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -21664,18 +21670,6 @@ namespace Model
 				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
 			}
 		}
-		
-		private void attach_Doc_DocManage(Doc_DocManage entity)
-		{
-			this.SendPropertyChanging();
-			entity.Base_DocType = this;
-		}
-		
-		private void detach_Doc_DocManage(Doc_DocManage entity)
-		{
-			this.SendPropertyChanging();
-			entity.Base_DocType = null;
-		}
 	}
 	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_EmergencyType")]
@@ -97436,10 +97430,10 @@ namespace Model
 		
 		private string _AuditMan;
 		
-		private string _Problem;
-		
 		private string _Measure;
 		
+		private string _Problem;
+		
 		private EntityRef<Sys_User> _Sys_User;
 		
 		private EntityRef<Base_CNProfessional> _Base_CNProfessional;
@@ -97486,10 +97480,10 @@ namespace Model
     partial void OnStatusChanged();
     partial void OnAuditManChanging(string value);
     partial void OnAuditManChanged();
-    partial void OnProblemChanging(string value);
-    partial void OnProblemChanged();
     partial void OnMeasureChanging(string value);
     partial void OnMeasureChanged();
+    partial void OnProblemChanging(string value);
+    partial void OnProblemChanged();
     #endregion
 		
 		public Comprehensive_NCRManagement()
@@ -97857,27 +97851,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Problem", DbType="VarChar(50)")]
-		public string Problem
-		{
-			get
-			{
-				return this._Problem;
-			}
-			set
-			{
-				if ((this._Problem != value))
-				{
-					this.OnProblemChanging(value);
-					this.SendPropertyChanging();
-					this._Problem = value;
-					this.SendPropertyChanged("Problem");
-					this.OnProblemChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measure", DbType="VarChar(100)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measure", DbType="VarChar(500)")]
 		public string Measure
 		{
 			get
@@ -97897,6 +97871,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Problem", DbType="VarChar(100)")]
+		public string Problem
+		{
+			get
+			{
+				return this._Problem;
+			}
+			set
+			{
+				if ((this._Problem != value))
+				{
+					this.OnProblemChanging(value);
+					this.SendPropertyChanging();
+					this._Problem = value;
+					this.SendPropertyChanged("Problem");
+					this.OnProblemChanged();
+				}
+			}
+		}
+		
 		[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 +101137,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 +101173,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 +101437,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
 		{
@@ -120067,8 +120085,6 @@ namespace Model
 		
 		private EntityRef<Base_CNProfessional> _Base_CNProfessional;
 		
-		private EntityRef<Base_DocType> _Base_DocType;
-		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Base_Unit> _Base_Unit;
@@ -120120,7 +120136,6 @@ namespace Model
 		public Doc_DocManage()
 		{
 			this._Base_CNProfessional = default(EntityRef<Base_CNProfessional>);
-			this._Base_DocType = default(EntityRef<Base_DocType>);
 			this._Base_Project = default(EntityRef<Base_Project>);
 			this._Base_Unit = default(EntityRef<Base_Unit>);
 			this._Sys_User = default(EntityRef<Sys_User>);
@@ -120199,10 +120214,6 @@ namespace Model
 			{
 				if ((this._DocTypeId != value))
 				{
-					if (this._Base_DocType.HasLoadedOrAssignedValue)
-					{
-						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
-					}
 					this.OnDocTypeIdChanging(value);
 					this.SendPropertyChanging();
 					this._DocTypeId = value;
@@ -120522,40 +120533,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_DocType", Storage="_Base_DocType", ThisKey="DocTypeId", OtherKey="DocTypeId", IsForeignKey=true)]
-		public Base_DocType Base_DocType
-		{
-			get
-			{
-				return this._Base_DocType.Entity;
-			}
-			set
-			{
-				Base_DocType previousValue = this._Base_DocType.Entity;
-				if (((previousValue != value) 
-							|| (this._Base_DocType.HasLoadedOrAssignedValue == false)))
-				{
-					this.SendPropertyChanging();
-					if ((previousValue != null))
-					{
-						this._Base_DocType.Entity = null;
-						previousValue.Doc_DocManage.Remove(this);
-					}
-					this._Base_DocType.Entity = value;
-					if ((value != null))
-					{
-						value.Doc_DocManage.Add(this);
-						this._DocTypeId = value.DocTypeId;
-					}
-					else
-					{
-						this._DocTypeId = default(string);
-					}
-					this.SendPropertyChanged("Base_DocType");
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -120726,8 +120703,6 @@ namespace Model
 		
 		private EntityRef<Doc_DocManage> _Doc_DocManage;
 		
-		private EntityRef<Sys_User> _Sys_User;
-		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -120751,7 +120726,6 @@ namespace Model
 		public Doc_DocManageApprove()
 		{
 			this._Doc_DocManage = default(EntityRef<Doc_DocManage>);
-			this._Sys_User = default(EntityRef<Sys_User>);
 			OnCreated();
 		}
 		
@@ -120799,7 +120773,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(500)")]
 		public string ApproveMan
 		{
 			get
@@ -120810,10 +120784,6 @@ namespace Model
 			{
 				if ((this._ApproveMan != value))
 				{
-					if (this._Sys_User.HasLoadedOrAssignedValue)
-					{
-						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
-					}
 					this.OnApproveManChanging(value);
 					this.SendPropertyChanging();
 					this._ApproveMan = value;
@@ -120937,40 +120907,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManageApprove_Sys_User", Storage="_Sys_User", ThisKey="ApproveMan", OtherKey="UserId", IsForeignKey=true)]
-		public Sys_User Sys_User
-		{
-			get
-			{
-				return this._Sys_User.Entity;
-			}
-			set
-			{
-				Sys_User previousValue = this._Sys_User.Entity;
-				if (((previousValue != value) 
-							|| (this._Sys_User.HasLoadedOrAssignedValue == false)))
-				{
-					this.SendPropertyChanging();
-					if ((previousValue != null))
-					{
-						this._Sys_User.Entity = null;
-						previousValue.Doc_DocManageApprove.Remove(this);
-					}
-					this._Sys_User.Entity = value;
-					if ((value != null))
-					{
-						value.Doc_DocManageApprove.Add(this);
-						this._ApproveMan = value.UserId;
-					}
-					else
-					{
-						this._ApproveMan = default(string);
-					}
-					this.SendPropertyChanged("Sys_User");
-				}
-			}
-		}
-		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -234734,6 +234670,229 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_ComplianceObligations")]
+	public partial class Manager_Month_ComplianceObligations : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _ComplianceObligationsId;
+		
+		private string _MonthReportId;
+		
+		private string _InformationContent;
+		
+		private string _ResponseMeasures;
+		
+		private string _ImplementationStatus;
+		
+		private string _EvaluationConclusion;
+		
+		private EntityRef<Manager_MonthReportC> _Manager_MonthReportC;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnComplianceObligationsIdChanging(string value);
+    partial void OnComplianceObligationsIdChanged();
+    partial void OnMonthReportIdChanging(string value);
+    partial void OnMonthReportIdChanged();
+    partial void OnInformationContentChanging(string value);
+    partial void OnInformationContentChanged();
+    partial void OnResponseMeasuresChanging(string value);
+    partial void OnResponseMeasuresChanged();
+    partial void OnImplementationStatusChanging(string value);
+    partial void OnImplementationStatusChanged();
+    partial void OnEvaluationConclusionChanging(string value);
+    partial void OnEvaluationConclusionChanged();
+    #endregion
+		
+		public Manager_Month_ComplianceObligations()
+		{
+			this._Manager_MonthReportC = default(EntityRef<Manager_MonthReportC>);
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ComplianceObligationsId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string ComplianceObligationsId
+		{
+			get
+			{
+				return this._ComplianceObligationsId;
+			}
+			set
+			{
+				if ((this._ComplianceObligationsId != value))
+				{
+					this.OnComplianceObligationsIdChanging(value);
+					this.SendPropertyChanging();
+					this._ComplianceObligationsId = value;
+					this.SendPropertyChanged("ComplianceObligationsId");
+					this.OnComplianceObligationsIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportId", DbType="NVarChar(50)")]
+		public string MonthReportId
+		{
+			get
+			{
+				return this._MonthReportId;
+			}
+			set
+			{
+				if ((this._MonthReportId != value))
+				{
+					if (this._Manager_MonthReportC.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnMonthReportIdChanging(value);
+					this.SendPropertyChanging();
+					this._MonthReportId = value;
+					this.SendPropertyChanged("MonthReportId");
+					this.OnMonthReportIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InformationContent", DbType="NVarChar(500)")]
+		public string InformationContent
+		{
+			get
+			{
+				return this._InformationContent;
+			}
+			set
+			{
+				if ((this._InformationContent != value))
+				{
+					this.OnInformationContentChanging(value);
+					this.SendPropertyChanging();
+					this._InformationContent = value;
+					this.SendPropertyChanged("InformationContent");
+					this.OnInformationContentChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponseMeasures", DbType="NVarChar(500)")]
+		public string ResponseMeasures
+		{
+			get
+			{
+				return this._ResponseMeasures;
+			}
+			set
+			{
+				if ((this._ResponseMeasures != value))
+				{
+					this.OnResponseMeasuresChanging(value);
+					this.SendPropertyChanging();
+					this._ResponseMeasures = value;
+					this.SendPropertyChanged("ResponseMeasures");
+					this.OnResponseMeasuresChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ImplementationStatus", DbType="NVarChar(500)")]
+		public string ImplementationStatus
+		{
+			get
+			{
+				return this._ImplementationStatus;
+			}
+			set
+			{
+				if ((this._ImplementationStatus != value))
+				{
+					this.OnImplementationStatusChanging(value);
+					this.SendPropertyChanging();
+					this._ImplementationStatus = value;
+					this.SendPropertyChanged("ImplementationStatus");
+					this.OnImplementationStatusChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EvaluationConclusion", DbType="NVarChar(50)")]
+		public string EvaluationConclusion
+		{
+			get
+			{
+				return this._EvaluationConclusion;
+			}
+			set
+			{
+				if ((this._EvaluationConclusion != value))
+				{
+					this.OnEvaluationConclusionChanging(value);
+					this.SendPropertyChanging();
+					this._EvaluationConclusion = value;
+					this.SendPropertyChanged("EvaluationConclusion");
+					this.OnEvaluationConclusionChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligations_Manager_MonthReportC", Storage="_Manager_MonthReportC", ThisKey="MonthReportId", OtherKey="MonthReportId", IsForeignKey=true)]
+		public Manager_MonthReportC Manager_MonthReportC
+		{
+			get
+			{
+				return this._Manager_MonthReportC.Entity;
+			}
+			set
+			{
+				Manager_MonthReportC previousValue = this._Manager_MonthReportC.Entity;
+				if (((previousValue != value) 
+							|| (this._Manager_MonthReportC.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Manager_MonthReportC.Entity = null;
+						previousValue.Manager_Month_ComplianceObligations.Remove(this);
+					}
+					this._Manager_MonthReportC.Entity = value;
+					if ((value != null))
+					{
+						value.Manager_Month_ComplianceObligations.Add(this);
+						this._MonthReportId = value.MonthReportId;
+					}
+					else
+					{
+						this._MonthReportId = default(string);
+					}
+					this.SendPropertyChanged("Manager_MonthReportC");
+				}
+			}
+		}
+		
+		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.Manager_Month_ComplianceObligationsC")]
 	public partial class Manager_Month_ComplianceObligationsC : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -240933,6 +241092,8 @@ namespace Model
 		
 		private EntitySet<Manager_Month_CheckC> _Manager_Month_CheckC;
 		
+		private EntitySet<Manager_Month_ComplianceObligations> _Manager_Month_ComplianceObligations;
+		
 		private EntitySet<Manager_Month_ComplianceObligationsC> _Manager_Month_ComplianceObligationsC;
 		
 		private EntitySet<Manager_Month_CostInvestmentPlanC> _Manager_Month_CostInvestmentPlanC;
@@ -241205,6 +241366,7 @@ namespace Model
 			this._Manager_Month_ActivitiesC = new EntitySet<Manager_Month_ActivitiesC>(new Action<Manager_Month_ActivitiesC>(this.attach_Manager_Month_ActivitiesC), new Action<Manager_Month_ActivitiesC>(this.detach_Manager_Month_ActivitiesC));
 			this._Manager_Month_ActivityDesC = new EntitySet<Manager_Month_ActivityDesC>(new Action<Manager_Month_ActivityDesC>(this.attach_Manager_Month_ActivityDesC), new Action<Manager_Month_ActivityDesC>(this.detach_Manager_Month_ActivityDesC));
 			this._Manager_Month_CheckC = new EntitySet<Manager_Month_CheckC>(new Action<Manager_Month_CheckC>(this.attach_Manager_Month_CheckC), new Action<Manager_Month_CheckC>(this.detach_Manager_Month_CheckC));
+			this._Manager_Month_ComplianceObligations = new EntitySet<Manager_Month_ComplianceObligations>(new Action<Manager_Month_ComplianceObligations>(this.attach_Manager_Month_ComplianceObligations), new Action<Manager_Month_ComplianceObligations>(this.detach_Manager_Month_ComplianceObligations));
 			this._Manager_Month_ComplianceObligationsC = new EntitySet<Manager_Month_ComplianceObligationsC>(new Action<Manager_Month_ComplianceObligationsC>(this.attach_Manager_Month_ComplianceObligationsC), new Action<Manager_Month_ComplianceObligationsC>(this.detach_Manager_Month_ComplianceObligationsC));
 			this._Manager_Month_CostInvestmentPlanC = new EntitySet<Manager_Month_CostInvestmentPlanC>(new Action<Manager_Month_CostInvestmentPlanC>(this.attach_Manager_Month_CostInvestmentPlanC), new Action<Manager_Month_CostInvestmentPlanC>(this.detach_Manager_Month_CostInvestmentPlanC));
 			this._Manager_Month_EmergencyExercisesC = new EntitySet<Manager_Month_EmergencyExercisesC>(new Action<Manager_Month_EmergencyExercisesC>(this.attach_Manager_Month_EmergencyExercisesC), new Action<Manager_Month_EmergencyExercisesC>(this.detach_Manager_Month_EmergencyExercisesC));
@@ -243385,6 +243547,19 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligations_Manager_MonthReportC", Storage="_Manager_Month_ComplianceObligations", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")]
+		public EntitySet<Manager_Month_ComplianceObligations> Manager_Month_ComplianceObligations
+		{
+			get
+			{
+				return this._Manager_Month_ComplianceObligations;
+			}
+			set
+			{
+				this._Manager_Month_ComplianceObligations.Assign(value);
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligationsC_Manager_MonthReportC", Storage="_Manager_Month_ComplianceObligationsC", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")]
 		public EntitySet<Manager_Month_ComplianceObligationsC> Manager_Month_ComplianceObligationsC
 		{
@@ -243966,6 +244141,18 @@ namespace Model
 			entity.Manager_MonthReportC = null;
 		}
 		
+		private void attach_Manager_Month_ComplianceObligations(Manager_Month_ComplianceObligations entity)
+		{
+			this.SendPropertyChanging();
+			entity.Manager_MonthReportC = this;
+		}
+		
+		private void detach_Manager_Month_ComplianceObligations(Manager_Month_ComplianceObligations entity)
+		{
+			this.SendPropertyChanging();
+			entity.Manager_MonthReportC = null;
+		}
+		
 		private void attach_Manager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC entity)
 		{
 			this.SendPropertyChanging();
@@ -272310,7 +272497,7 @@ namespace Model
 		
 		private System.Nullable<int> _ProblemType;
 		
-		private string _SubInspectId;
+		private string _QuestionTechnologyId;
 		
 		private string _TermItemId;
 		
@@ -272324,18 +272511,20 @@ namespace Model
 		
 		private string _InspectUser;
 		
-		private string _HandleUser;
-		
 		private string _ApproveUser;
 		
-		private System.Nullable<System.DateTime> _AdjustCompleteTime;
-		
 		private System.Nullable<int> _ApproveState;
 		
 		private string _AddUser;
 		
 		private System.Nullable<System.DateTime> _AddTime;
 		
+		private string _HandleUser;
+		
+		private System.Nullable<System.DateTime> _AdjustCompleteTime;
+		
+		private string _SubInspectId;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -272352,8 +272541,8 @@ namespace Model
     partial void OnConstructionUnitChanged();
     partial void OnProblemTypeChanging(System.Nullable<int> value);
     partial void OnProblemTypeChanged();
-    partial void OnSubInspectIdChanging(string value);
-    partial void OnSubInspectIdChanged();
+    partial void OnQuestionTechnologyIdChanging(string value);
+    partial void OnQuestionTechnologyIdChanged();
     partial void OnTermItemIdChanging(string value);
     partial void OnTermItemIdChanged();
     partial void OnWorkPackIdChanging(string value);
@@ -272366,18 +272555,20 @@ namespace Model
     partial void OnRectifyTimeChanged();
     partial void OnInspectUserChanging(string value);
     partial void OnInspectUserChanged();
-    partial void OnHandleUserChanging(string value);
-    partial void OnHandleUserChanged();
     partial void OnApproveUserChanging(string value);
     partial void OnApproveUserChanged();
-    partial void OnAdjustCompleteTimeChanging(System.Nullable<System.DateTime> value);
-    partial void OnAdjustCompleteTimeChanged();
     partial void OnApproveStateChanging(System.Nullable<int> value);
     partial void OnApproveStateChanged();
     partial void OnAddUserChanging(string value);
     partial void OnAddUserChanged();
     partial void OnAddTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnAddTimeChanged();
+    partial void OnHandleUserChanging(string value);
+    partial void OnHandleUserChanged();
+    partial void OnAdjustCompleteTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnAdjustCompleteTimeChanged();
+    partial void OnSubInspectIdChanging(string value);
+    partial void OnSubInspectIdChanged();
     #endregion
 		
 		public PreRun_InspectTailTerm()
@@ -272505,22 +272696,22 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="VarChar(50)")]
-		public string SubInspectId
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuestionTechnologyId", DbType="VarChar(50)")]
+		public string QuestionTechnologyId
 		{
 			get
 			{
-				return this._SubInspectId;
+				return this._QuestionTechnologyId;
 			}
 			set
 			{
-				if ((this._SubInspectId != value))
+				if ((this._QuestionTechnologyId != value))
 				{
-					this.OnSubInspectIdChanging(value);
+					this.OnQuestionTechnologyIdChanging(value);
 					this.SendPropertyChanging();
-					this._SubInspectId = value;
-					this.SendPropertyChanged("SubInspectId");
-					this.OnSubInspectIdChanged();
+					this._QuestionTechnologyId = value;
+					this.SendPropertyChanged("QuestionTechnologyId");
+					this.OnQuestionTechnologyIdChanged();
 				}
 			}
 		}
@@ -272645,26 +272836,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")]
-		public string HandleUser
-		{
-			get
-			{
-				return this._HandleUser;
-			}
-			set
-			{
-				if ((this._HandleUser != value))
-				{
-					this.OnHandleUserChanging(value);
-					this.SendPropertyChanging();
-					this._HandleUser = value;
-					this.SendPropertyChanged("HandleUser");
-					this.OnHandleUserChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveUser", DbType="VarChar(50)")]
 		public string ApproveUser
 		{
@@ -272685,26 +272856,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")]
-		public System.Nullable<System.DateTime> AdjustCompleteTime
-		{
-			get
-			{
-				return this._AdjustCompleteTime;
-			}
-			set
-			{
-				if ((this._AdjustCompleteTime != value))
-				{
-					this.OnAdjustCompleteTimeChanging(value);
-					this.SendPropertyChanging();
-					this._AdjustCompleteTime = value;
-					this.SendPropertyChanged("AdjustCompleteTime");
-					this.OnAdjustCompleteTimeChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")]
 		public System.Nullable<int> ApproveState
 		{
@@ -272765,6 +272916,66 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")]
+		public string HandleUser
+		{
+			get
+			{
+				return this._HandleUser;
+			}
+			set
+			{
+				if ((this._HandleUser != value))
+				{
+					this.OnHandleUserChanging(value);
+					this.SendPropertyChanging();
+					this._HandleUser = value;
+					this.SendPropertyChanged("HandleUser");
+					this.OnHandleUserChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> AdjustCompleteTime
+		{
+			get
+			{
+				return this._AdjustCompleteTime;
+			}
+			set
+			{
+				if ((this._AdjustCompleteTime != value))
+				{
+					this.OnAdjustCompleteTimeChanging(value);
+					this.SendPropertyChanging();
+					this._AdjustCompleteTime = value;
+					this.SendPropertyChanged("AdjustCompleteTime");
+					this.OnAdjustCompleteTimeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="NVarChar(50)")]
+		public string SubInspectId
+		{
+			get
+			{
+				return this._SubInspectId;
+			}
+			set
+			{
+				if ((this._SubInspectId != value))
+				{
+					this.OnSubInspectIdChanging(value);
+					this.SendPropertyChanging();
+					this._SubInspectId = value;
+					this.SendPropertyChanged("SubInspectId");
+					this.OnSubInspectIdChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -272806,14 +273017,14 @@ namespace Model
 		
 		private string _ApproveUser;
 		
-		private System.Nullable<int> _ApproveType;
-		
 		private System.Nullable<int> _ApproveState;
 		
 		private string _AddUser;
 		
 		private System.Nullable<System.DateTime> _AddTime;
 		
+		private System.Nullable<int> _ApproveType;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -272832,14 +273043,14 @@ namespace Model
     partial void OnApproveTimeChanged();
     partial void OnApproveUserChanging(string value);
     partial void OnApproveUserChanged();
-    partial void OnApproveTypeChanging(System.Nullable<int> value);
-    partial void OnApproveTypeChanged();
     partial void OnApproveStateChanging(System.Nullable<int> value);
     partial void OnApproveStateChanged();
     partial void OnAddUserChanging(string value);
     partial void OnAddUserChanged();
     partial void OnAddTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnAddTimeChanged();
+    partial void OnApproveTypeChanging(System.Nullable<int> value);
+    partial void OnApproveTypeChanged();
     #endregion
 		
 		public PreRun_InspectTermApproveRecords()
@@ -272987,26 +273198,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")]
-		public System.Nullable<int> ApproveType
-		{
-			get
-			{
-				return this._ApproveType;
-			}
-			set
-			{
-				if ((this._ApproveType != value))
-				{
-					this.OnApproveTypeChanging(value);
-					this.SendPropertyChanging();
-					this._ApproveType = value;
-					this.SendPropertyChanged("ApproveType");
-					this.OnApproveTypeChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")]
 		public System.Nullable<int> ApproveState
 		{
@@ -273067,6 +273258,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")]
+		public System.Nullable<int> ApproveType
+		{
+			get
+			{
+				return this._ApproveType;
+			}
+			set
+			{
+				if ((this._ApproveType != value))
+				{
+					this.OnApproveTypeChanging(value);
+					this.SendPropertyChanging();
+					this._ApproveType = value;
+					this.SendPropertyChanged("ApproveType");
+					this.OnApproveTypeChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -273999,7 +274210,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
 		public string Remark
 		{
 			get
@@ -274122,6 +274333,12 @@ namespace Model
 		
 		private string _InspectResult;
 		
+		private System.Nullable<System.DateTime> _InspectTime;
+		
+		private string _AddUser;
+		
+		private System.Nullable<System.DateTime> _AddTime;
+		
 		private string _Subcontractor;
 		
 		private string _Contractor;
@@ -274130,6 +274347,12 @@ namespace Model
 		
 		private string _Owner;
 		
+		private System.Nullable<int> _IsUnifyWanderAbout;
+		
+		private System.Nullable<System.DateTime> _UnifyWanderAboutData;
+		
+		private string _UnifyWanderAboutOpinion;
+		
 		private System.Nullable<int> _InspectionIsAllPass;
 		
 		private System.Nullable<int> _SubcontractorIsAllPass;
@@ -274140,9 +274363,7 @@ namespace Model
 		
 		private System.Nullable<int> _OwnerIsAllPass;
 		
-		private System.Nullable<int> _WorkPackType;
-		
-		private string _PropertyTechnologyId;
+		private System.Nullable<int> _WanderIsComplete;
 		
 		private System.Nullable<System.DateTime> _SubcontractorAllPassData;
 		
@@ -274152,35 +274373,25 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _OwnerAllPassData;
 		
-		private System.Nullable<int> _WanderIsComplete;
-		
 		private System.Nullable<System.DateTime> _WanderCompleteData;
 		
+		private System.Nullable<int> _WorkPackType;
+		
 		private System.Nullable<int> _IsSiteImplement;
 		
-		private string _SiteImplementUser;
-		
-		private System.Nullable<System.DateTime> _SiteImplementConfirmData;
-		
-		private System.Nullable<System.DateTime> _RecordUploadData;
-		
 		private System.Nullable<int> _InspectIsClose;
 		
-		private string _InspectIsCloseUser;
-		
 		private System.Nullable<System.DateTime> _InspectCloseData;
 		
-		private System.Nullable<int> _IsUnifyWanderAbout;
+		private string _InspectIsCloseUser;
 		
-		private System.Nullable<System.DateTime> _UnifyWanderAboutData;
+		private string _PropertyTechnologyId;
 		
-		private string _UnifyWanderAboutOpinion;
+		private System.Nullable<System.DateTime> _RecordUploadData;
 		
-		private System.Nullable<System.DateTime> _InspectTime;
+		private System.Nullable<System.DateTime> _SiteImplementConfirmData;
 		
-		private string _AddUser;
-		
-		private System.Nullable<System.DateTime> _AddTime;
+		private string _SiteImplementUser;
 		
     #region 可扩展性方法定义
     partial void OnLoaded();
@@ -274202,6 +274413,12 @@ namespace Model
     partial void OnWorkPackIdChanged();
     partial void OnInspectResultChanging(string value);
     partial void OnInspectResultChanged();
+    partial void OnInspectTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnInspectTimeChanged();
+    partial void OnAddUserChanging(string value);
+    partial void OnAddUserChanged();
+    partial void OnAddTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnAddTimeChanged();
     partial void OnSubcontractorChanging(string value);
     partial void OnSubcontractorChanged();
     partial void OnContractorChanging(string value);
@@ -274210,6 +274427,12 @@ namespace Model
     partial void OnSupervisionChanged();
     partial void OnOwnerChanging(string value);
     partial void OnOwnerChanged();
+    partial void OnIsUnifyWanderAboutChanging(System.Nullable<int> value);
+    partial void OnIsUnifyWanderAboutChanged();
+    partial void OnUnifyWanderAboutDataChanging(System.Nullable<System.DateTime> value);
+    partial void OnUnifyWanderAboutDataChanged();
+    partial void OnUnifyWanderAboutOpinionChanging(string value);
+    partial void OnUnifyWanderAboutOpinionChanged();
     partial void OnInspectionIsAllPassChanging(System.Nullable<int> value);
     partial void OnInspectionIsAllPassChanged();
     partial void OnSubcontractorIsAllPassChanging(System.Nullable<int> value);
@@ -274220,10 +274443,8 @@ namespace Model
     partial void OnSupervisionIsAllPassChanged();
     partial void OnOwnerIsAllPassChanging(System.Nullable<int> value);
     partial void OnOwnerIsAllPassChanged();
-    partial void OnWorkPackTypeChanging(System.Nullable<int> value);
-    partial void OnWorkPackTypeChanged();
-    partial void OnPropertyTechnologyIdChanging(string value);
-    partial void OnPropertyTechnologyIdChanged();
+    partial void OnWanderIsCompleteChanging(System.Nullable<int> value);
+    partial void OnWanderIsCompleteChanged();
     partial void OnSubcontractorAllPassDataChanging(System.Nullable<System.DateTime> value);
     partial void OnSubcontractorAllPassDataChanged();
     partial void OnContractorAllPassDataChanging(System.Nullable<System.DateTime> value);
@@ -274232,36 +274453,26 @@ namespace Model
     partial void OnSupervisionAllPassDataChanged();
     partial void OnOwnerAllPassDataChanging(System.Nullable<System.DateTime> value);
     partial void OnOwnerAllPassDataChanged();
-    partial void OnWanderIsCompleteChanging(System.Nullable<int> value);
-    partial void OnWanderIsCompleteChanged();
     partial void OnWanderCompleteDataChanging(System.Nullable<System.DateTime> value);
     partial void OnWanderCompleteDataChanged();
+    partial void OnWorkPackTypeChanging(System.Nullable<int> value);
+    partial void OnWorkPackTypeChanged();
     partial void OnIsSiteImplementChanging(System.Nullable<int> value);
     partial void OnIsSiteImplementChanged();
-    partial void OnSiteImplementUserChanging(string value);
-    partial void OnSiteImplementUserChanged();
-    partial void OnSiteImplementConfirmDataChanging(System.Nullable<System.DateTime> value);
-    partial void OnSiteImplementConfirmDataChanged();
-    partial void OnRecordUploadDataChanging(System.Nullable<System.DateTime> value);
-    partial void OnRecordUploadDataChanged();
     partial void OnInspectIsCloseChanging(System.Nullable<int> value);
     partial void OnInspectIsCloseChanged();
-    partial void OnInspectIsCloseUserChanging(string value);
-    partial void OnInspectIsCloseUserChanged();
     partial void OnInspectCloseDataChanging(System.Nullable<System.DateTime> value);
     partial void OnInspectCloseDataChanged();
-    partial void OnIsUnifyWanderAboutChanging(System.Nullable<int> value);
-    partial void OnIsUnifyWanderAboutChanged();
-    partial void OnUnifyWanderAboutDataChanging(System.Nullable<System.DateTime> value);
-    partial void OnUnifyWanderAboutDataChanged();
-    partial void OnUnifyWanderAboutOpinionChanging(string value);
-    partial void OnUnifyWanderAboutOpinionChanged();
-    partial void OnInspectTimeChanging(System.Nullable<System.DateTime> value);
-    partial void OnInspectTimeChanged();
-    partial void OnAddUserChanging(string value);
-    partial void OnAddUserChanged();
-    partial void OnAddTimeChanging(System.Nullable<System.DateTime> value);
-    partial void OnAddTimeChanged();
+    partial void OnInspectIsCloseUserChanging(string value);
+    partial void OnInspectIsCloseUserChanged();
+    partial void OnPropertyTechnologyIdChanging(string value);
+    partial void OnPropertyTechnologyIdChanged();
+    partial void OnRecordUploadDataChanging(System.Nullable<System.DateTime> value);
+    partial void OnRecordUploadDataChanged();
+    partial void OnSiteImplementConfirmDataChanging(System.Nullable<System.DateTime> value);
+    partial void OnSiteImplementConfirmDataChanged();
+    partial void OnSiteImplementUserChanging(string value);
+    partial void OnSiteImplementUserChanged();
     #endregion
 		
 		public PreRun_SubInspectTerm()
@@ -274429,6 +274640,66 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> InspectTime
+		{
+			get
+			{
+				return this._InspectTime;
+			}
+			set
+			{
+				if ((this._InspectTime != value))
+				{
+					this.OnInspectTimeChanging(value);
+					this.SendPropertyChanging();
+					this._InspectTime = value;
+					this.SendPropertyChanged("InspectTime");
+					this.OnInspectTimeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")]
+		public string AddUser
+		{
+			get
+			{
+				return this._AddUser;
+			}
+			set
+			{
+				if ((this._AddUser != value))
+				{
+					this.OnAddUserChanging(value);
+					this.SendPropertyChanging();
+					this._AddUser = value;
+					this.SendPropertyChanged("AddUser");
+					this.OnAddUserChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> AddTime
+		{
+			get
+			{
+				return this._AddTime;
+			}
+			set
+			{
+				if ((this._AddTime != value))
+				{
+					this.OnAddTimeChanging(value);
+					this.SendPropertyChanging();
+					this._AddTime = value;
+					this.SendPropertyChanged("AddTime");
+					this.OnAddTimeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Subcontractor", DbType="VarChar(50)")]
 		public string Subcontractor
 		{
@@ -274509,6 +274780,66 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUnifyWanderAbout", DbType="Int")]
+		public System.Nullable<int> IsUnifyWanderAbout
+		{
+			get
+			{
+				return this._IsUnifyWanderAbout;
+			}
+			set
+			{
+				if ((this._IsUnifyWanderAbout != value))
+				{
+					this.OnIsUnifyWanderAboutChanging(value);
+					this.SendPropertyChanging();
+					this._IsUnifyWanderAbout = value;
+					this.SendPropertyChanged("IsUnifyWanderAbout");
+					this.OnIsUnifyWanderAboutChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutData", DbType="DateTime")]
+		public System.Nullable<System.DateTime> UnifyWanderAboutData
+		{
+			get
+			{
+				return this._UnifyWanderAboutData;
+			}
+			set
+			{
+				if ((this._UnifyWanderAboutData != value))
+				{
+					this.OnUnifyWanderAboutDataChanging(value);
+					this.SendPropertyChanging();
+					this._UnifyWanderAboutData = value;
+					this.SendPropertyChanged("UnifyWanderAboutData");
+					this.OnUnifyWanderAboutDataChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		public string UnifyWanderAboutOpinion
+		{
+			get
+			{
+				return this._UnifyWanderAboutOpinion;
+			}
+			set
+			{
+				if ((this._UnifyWanderAboutOpinion != value))
+				{
+					this.OnUnifyWanderAboutOpinionChanging(value);
+					this.SendPropertyChanging();
+					this._UnifyWanderAboutOpinion = value;
+					this.SendPropertyChanged("UnifyWanderAboutOpinion");
+					this.OnUnifyWanderAboutOpinionChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionIsAllPass", DbType="Int")]
 		public System.Nullable<int> InspectionIsAllPass
 		{
@@ -274609,42 +274940,22 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")]
-		public System.Nullable<int> WorkPackType
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderIsComplete", DbType="Int")]
+		public System.Nullable<int> WanderIsComplete
 		{
 			get
 			{
-				return this._WorkPackType;
+				return this._WanderIsComplete;
 			}
 			set
 			{
-				if ((this._WorkPackType != value))
+				if ((this._WanderIsComplete != value))
 				{
-					this.OnWorkPackTypeChanging(value);
+					this.OnWanderIsCompleteChanging(value);
 					this.SendPropertyChanging();
-					this._WorkPackType = value;
-					this.SendPropertyChanged("WorkPackType");
-					this.OnWorkPackTypeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
-		public string PropertyTechnologyId
-		{
-			get
-			{
-				return this._PropertyTechnologyId;
-			}
-			set
-			{
-				if ((this._PropertyTechnologyId != value))
-				{
-					this.OnPropertyTechnologyIdChanging(value);
-					this.SendPropertyChanging();
-					this._PropertyTechnologyId = value;
-					this.SendPropertyChanged("PropertyTechnologyId");
-					this.OnPropertyTechnologyIdChanged();
+					this._WanderIsComplete = value;
+					this.SendPropertyChanged("WanderIsComplete");
+					this.OnWanderIsCompleteChanged();
 				}
 			}
 		}
@@ -274729,26 +275040,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderIsComplete", DbType="Int")]
-		public System.Nullable<int> WanderIsComplete
-		{
-			get
-			{
-				return this._WanderIsComplete;
-			}
-			set
-			{
-				if ((this._WanderIsComplete != value))
-				{
-					this.OnWanderIsCompleteChanging(value);
-					this.SendPropertyChanging();
-					this._WanderIsComplete = value;
-					this.SendPropertyChanged("WanderIsComplete");
-					this.OnWanderIsCompleteChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderCompleteData", DbType="DateTime")]
 		public System.Nullable<System.DateTime> WanderCompleteData
 		{
@@ -274769,6 +275060,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")]
+		public System.Nullable<int> WorkPackType
+		{
+			get
+			{
+				return this._WorkPackType;
+			}
+			set
+			{
+				if ((this._WorkPackType != value))
+				{
+					this.OnWorkPackTypeChanging(value);
+					this.SendPropertyChanging();
+					this._WorkPackType = value;
+					this.SendPropertyChanged("WorkPackType");
+					this.OnWorkPackTypeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSiteImplement", DbType="Int")]
 		public System.Nullable<int> IsSiteImplement
 		{
@@ -274789,66 +275100,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="VarChar(50)")]
-		public string SiteImplementUser
-		{
-			get
-			{
-				return this._SiteImplementUser;
-			}
-			set
-			{
-				if ((this._SiteImplementUser != value))
-				{
-					this.OnSiteImplementUserChanging(value);
-					this.SendPropertyChanging();
-					this._SiteImplementUser = value;
-					this.SendPropertyChanged("SiteImplementUser");
-					this.OnSiteImplementUserChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementConfirmData", DbType="DateTime")]
-		public System.Nullable<System.DateTime> SiteImplementConfirmData
-		{
-			get
-			{
-				return this._SiteImplementConfirmData;
-			}
-			set
-			{
-				if ((this._SiteImplementConfirmData != value))
-				{
-					this.OnSiteImplementConfirmDataChanging(value);
-					this.SendPropertyChanging();
-					this._SiteImplementConfirmData = value;
-					this.SendPropertyChanged("SiteImplementConfirmData");
-					this.OnSiteImplementConfirmDataChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordUploadData", DbType="DateTime")]
-		public System.Nullable<System.DateTime> RecordUploadData
-		{
-			get
-			{
-				return this._RecordUploadData;
-			}
-			set
-			{
-				if ((this._RecordUploadData != value))
-				{
-					this.OnRecordUploadDataChanging(value);
-					this.SendPropertyChanging();
-					this._RecordUploadData = value;
-					this.SendPropertyChanged("RecordUploadData");
-					this.OnRecordUploadDataChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsClose", DbType="Int")]
 		public System.Nullable<int> InspectIsClose
 		{
@@ -274869,26 +275120,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsCloseUser", DbType="VarChar(50)")]
-		public string InspectIsCloseUser
-		{
-			get
-			{
-				return this._InspectIsCloseUser;
-			}
-			set
-			{
-				if ((this._InspectIsCloseUser != value))
-				{
-					this.OnInspectIsCloseUserChanging(value);
-					this.SendPropertyChanging();
-					this._InspectIsCloseUser = value;
-					this.SendPropertyChanged("InspectIsCloseUser");
-					this.OnInspectIsCloseUserChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectCloseData", DbType="DateTime")]
 		public System.Nullable<System.DateTime> InspectCloseData
 		{
@@ -274909,122 +275140,102 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUnifyWanderAbout", DbType="Int")]
-		public System.Nullable<int> IsUnifyWanderAbout
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsCloseUser", DbType="NVarChar(50)")]
+		public string InspectIsCloseUser
 		{
 			get
 			{
-				return this._IsUnifyWanderAbout;
+				return this._InspectIsCloseUser;
 			}
 			set
 			{
-				if ((this._IsUnifyWanderAbout != value))
+				if ((this._InspectIsCloseUser != value))
 				{
-					this.OnIsUnifyWanderAboutChanging(value);
+					this.OnInspectIsCloseUserChanging(value);
 					this.SendPropertyChanging();
-					this._IsUnifyWanderAbout = value;
-					this.SendPropertyChanged("IsUnifyWanderAbout");
-					this.OnIsUnifyWanderAboutChanged();
+					this._InspectIsCloseUser = value;
+					this.SendPropertyChanged("InspectIsCloseUser");
+					this.OnInspectIsCloseUserChanged();
 				}
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutData", DbType="DateTime")]
-		public System.Nullable<System.DateTime> UnifyWanderAboutData
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="NVarChar(500)")]
+		public string PropertyTechnologyId
 		{
 			get
 			{
-				return this._UnifyWanderAboutData;
+				return this._PropertyTechnologyId;
 			}
 			set
 			{
-				if ((this._UnifyWanderAboutData != value))
+				if ((this._PropertyTechnologyId != value))
 				{
-					this.OnUnifyWanderAboutDataChanging(value);
+					this.OnPropertyTechnologyIdChanging(value);
 					this.SendPropertyChanging();
-					this._UnifyWanderAboutData = value;
-					this.SendPropertyChanged("UnifyWanderAboutData");
-					this.OnUnifyWanderAboutDataChanged();
+					this._PropertyTechnologyId = value;
+					this.SendPropertyChanged("PropertyTechnologyId");
+					this.OnPropertyTechnologyIdChanged();
 				}
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
-		public string UnifyWanderAboutOpinion
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordUploadData", DbType="DateTime")]
+		public System.Nullable<System.DateTime> RecordUploadData
 		{
 			get
 			{
-				return this._UnifyWanderAboutOpinion;
+				return this._RecordUploadData;
 			}
 			set
 			{
-				if ((this._UnifyWanderAboutOpinion != value))
+				if ((this._RecordUploadData != value))
 				{
-					this.OnUnifyWanderAboutOpinionChanging(value);
+					this.OnRecordUploadDataChanging(value);
 					this.SendPropertyChanging();
-					this._UnifyWanderAboutOpinion = value;
-					this.SendPropertyChanged("UnifyWanderAboutOpinion");
-					this.OnUnifyWanderAboutOpinionChanged();
+					this._RecordUploadData = value;
+					this.SendPropertyChanged("RecordUploadData");
+					this.OnRecordUploadDataChanged();
 				}
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")]
-		public System.Nullable<System.DateTime> InspectTime
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementConfirmData", DbType="DateTime")]
+		public System.Nullable<System.DateTime> SiteImplementConfirmData
 		{
 			get
 			{
-				return this._InspectTime;
+				return this._SiteImplementConfirmData;
 			}
 			set
 			{
-				if ((this._InspectTime != value))
+				if ((this._SiteImplementConfirmData != value))
 				{
-					this.OnInspectTimeChanging(value);
+					this.OnSiteImplementConfirmDataChanging(value);
 					this.SendPropertyChanging();
-					this._InspectTime = value;
-					this.SendPropertyChanged("InspectTime");
-					this.OnInspectTimeChanged();
+					this._SiteImplementConfirmData = value;
+					this.SendPropertyChanged("SiteImplementConfirmData");
+					this.OnSiteImplementConfirmDataChanged();
 				}
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")]
-		public string AddUser
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="NVarChar(50)")]
+		public string SiteImplementUser
 		{
 			get
 			{
-				return this._AddUser;
+				return this._SiteImplementUser;
 			}
 			set
 			{
-				if ((this._AddUser != value))
+				if ((this._SiteImplementUser != value))
 				{
-					this.OnAddUserChanging(value);
+					this.OnSiteImplementUserChanging(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();
+					this._SiteImplementUser = value;
+					this.SendPropertyChanged("SiteImplementUser");
+					this.OnSiteImplementUserChanged();
 				}
 			}
 		}
@@ -275092,22 +275303,6 @@ namespace Model
 		
 		private string _Owner;
 		
-		private System.Nullable<int> _SubcontractorIsPass;
-		
-		private System.Nullable<int> _ContractorIsPass;
-		
-		private System.Nullable<int> _SupervisionIsPass;
-		
-		private System.Nullable<int> _OwnerIsPass;
-		
-		private string _SubcontractorRemark;
-		
-		private string _ContractorRemark;
-		
-		private string _SupervisionRemark;
-		
-		private string _OwnerRemark;
-		
 		private System.Nullable<int> _WorkPackType;
 		
 		private string _PropertyTechnologyId;
@@ -275120,6 +275315,22 @@ namespace Model
 		
 		private System.Nullable<int> _Sort;
 		
+		private string _SubcontractorRemark;
+		
+		private string _ContractorRemark;
+		
+		private string _SupervisionRemark;
+		
+		private string _OwnerRemark;
+		
+		private System.Nullable<int> _SubcontractorIsPass;
+		
+		private System.Nullable<int> _ContractorIsPass;
+		
+		private System.Nullable<int> _SupervisionIsPass;
+		
+		private System.Nullable<int> _OwnerIsPass;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -275160,22 +275371,6 @@ namespace Model
     partial void OnSupervisionChanged();
     partial void OnOwnerChanging(string value);
     partial void OnOwnerChanged();
-    partial void OnSubcontractorIsPassChanging(System.Nullable<int> value);
-    partial void OnSubcontractorIsPassChanged();
-    partial void OnContractorIsPassChanging(System.Nullable<int> value);
-    partial void OnContractorIsPassChanged();
-    partial void OnSupervisionIsPassChanging(System.Nullable<int> value);
-    partial void OnSupervisionIsPassChanged();
-    partial void OnOwnerIsPassChanging(System.Nullable<int> value);
-    partial void OnOwnerIsPassChanged();
-    partial void OnSubcontractorRemarkChanging(string value);
-    partial void OnSubcontractorRemarkChanged();
-    partial void OnContractorRemarkChanging(string value);
-    partial void OnContractorRemarkChanged();
-    partial void OnSupervisionRemarkChanging(string value);
-    partial void OnSupervisionRemarkChanged();
-    partial void OnOwnerRemarkChanging(string value);
-    partial void OnOwnerRemarkChanged();
     partial void OnWorkPackTypeChanging(System.Nullable<int> value);
     partial void OnWorkPackTypeChanged();
     partial void OnPropertyTechnologyIdChanging(string value);
@@ -275188,6 +275383,22 @@ namespace Model
     partial void OnAddTimeChanged();
     partial void OnSortChanging(System.Nullable<int> value);
     partial void OnSortChanged();
+    partial void OnSubcontractorRemarkChanging(string value);
+    partial void OnSubcontractorRemarkChanged();
+    partial void OnContractorRemarkChanging(string value);
+    partial void OnContractorRemarkChanged();
+    partial void OnSupervisionRemarkChanging(string value);
+    partial void OnSupervisionRemarkChanged();
+    partial void OnOwnerRemarkChanging(string value);
+    partial void OnOwnerRemarkChanged();
+    partial void OnSubcontractorIsPassChanging(System.Nullable<int> value);
+    partial void OnSubcontractorIsPassChanged();
+    partial void OnContractorIsPassChanging(System.Nullable<int> value);
+    partial void OnContractorIsPassChanged();
+    partial void OnSupervisionIsPassChanging(System.Nullable<int> value);
+    partial void OnSupervisionIsPassChanged();
+    partial void OnOwnerIsPassChanging(System.Nullable<int> value);
+    partial void OnOwnerIsPassChanged();
     #endregion
 		
 		public PreRun_SubInspectTermItem()
@@ -275555,166 +275766,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsPass", DbType="Int")]
-		public System.Nullable<int> SubcontractorIsPass
-		{
-			get
-			{
-				return this._SubcontractorIsPass;
-			}
-			set
-			{
-				if ((this._SubcontractorIsPass != value))
-				{
-					this.OnSubcontractorIsPassChanging(value);
-					this.SendPropertyChanging();
-					this._SubcontractorIsPass = value;
-					this.SendPropertyChanged("SubcontractorIsPass");
-					this.OnSubcontractorIsPassChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorIsPass", DbType="Int")]
-		public System.Nullable<int> ContractorIsPass
-		{
-			get
-			{
-				return this._ContractorIsPass;
-			}
-			set
-			{
-				if ((this._ContractorIsPass != value))
-				{
-					this.OnContractorIsPassChanging(value);
-					this.SendPropertyChanging();
-					this._ContractorIsPass = value;
-					this.SendPropertyChanged("ContractorIsPass");
-					this.OnContractorIsPassChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionIsPass", DbType="Int")]
-		public System.Nullable<int> SupervisionIsPass
-		{
-			get
-			{
-				return this._SupervisionIsPass;
-			}
-			set
-			{
-				if ((this._SupervisionIsPass != value))
-				{
-					this.OnSupervisionIsPassChanging(value);
-					this.SendPropertyChanging();
-					this._SupervisionIsPass = value;
-					this.SendPropertyChanged("SupervisionIsPass");
-					this.OnSupervisionIsPassChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerIsPass", DbType="Int")]
-		public System.Nullable<int> OwnerIsPass
-		{
-			get
-			{
-				return this._OwnerIsPass;
-			}
-			set
-			{
-				if ((this._OwnerIsPass != value))
-				{
-					this.OnOwnerIsPassChanging(value);
-					this.SendPropertyChanging();
-					this._OwnerIsPass = value;
-					this.SendPropertyChanged("OwnerIsPass");
-					this.OnOwnerIsPassChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorRemark", DbType="VarChar(1000)")]
-		public string SubcontractorRemark
-		{
-			get
-			{
-				return this._SubcontractorRemark;
-			}
-			set
-			{
-				if ((this._SubcontractorRemark != value))
-				{
-					this.OnSubcontractorRemarkChanging(value);
-					this.SendPropertyChanging();
-					this._SubcontractorRemark = value;
-					this.SendPropertyChanged("SubcontractorRemark");
-					this.OnSubcontractorRemarkChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorRemark", DbType="VarChar(1000)")]
-		public string ContractorRemark
-		{
-			get
-			{
-				return this._ContractorRemark;
-			}
-			set
-			{
-				if ((this._ContractorRemark != value))
-				{
-					this.OnContractorRemarkChanging(value);
-					this.SendPropertyChanging();
-					this._ContractorRemark = value;
-					this.SendPropertyChanged("ContractorRemark");
-					this.OnContractorRemarkChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionRemark", DbType="VarChar(1000)")]
-		public string SupervisionRemark
-		{
-			get
-			{
-				return this._SupervisionRemark;
-			}
-			set
-			{
-				if ((this._SupervisionRemark != value))
-				{
-					this.OnSupervisionRemarkChanging(value);
-					this.SendPropertyChanging();
-					this._SupervisionRemark = value;
-					this.SendPropertyChanged("SupervisionRemark");
-					this.OnSupervisionRemarkChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerRemark", DbType="VarChar(1000)")]
-		public string OwnerRemark
-		{
-			get
-			{
-				return this._OwnerRemark;
-			}
-			set
-			{
-				if ((this._OwnerRemark != value))
-				{
-					this.OnOwnerRemarkChanging(value);
-					this.SendPropertyChanging();
-					this._OwnerRemark = value;
-					this.SendPropertyChanged("OwnerRemark");
-					this.OnOwnerRemarkChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")]
 		public System.Nullable<int> WorkPackType
 		{
@@ -275735,7 +275786,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(50)")]
 		public string PropertyTechnologyId
 		{
 			get
@@ -275835,6 +275886,166 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorRemark", DbType="VarChar(1000)")]
+		public string SubcontractorRemark
+		{
+			get
+			{
+				return this._SubcontractorRemark;
+			}
+			set
+			{
+				if ((this._SubcontractorRemark != value))
+				{
+					this.OnSubcontractorRemarkChanging(value);
+					this.SendPropertyChanging();
+					this._SubcontractorRemark = value;
+					this.SendPropertyChanged("SubcontractorRemark");
+					this.OnSubcontractorRemarkChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorRemark", DbType="VarChar(1000)")]
+		public string ContractorRemark
+		{
+			get
+			{
+				return this._ContractorRemark;
+			}
+			set
+			{
+				if ((this._ContractorRemark != value))
+				{
+					this.OnContractorRemarkChanging(value);
+					this.SendPropertyChanging();
+					this._ContractorRemark = value;
+					this.SendPropertyChanged("ContractorRemark");
+					this.OnContractorRemarkChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionRemark", DbType="VarChar(1000)")]
+		public string SupervisionRemark
+		{
+			get
+			{
+				return this._SupervisionRemark;
+			}
+			set
+			{
+				if ((this._SupervisionRemark != value))
+				{
+					this.OnSupervisionRemarkChanging(value);
+					this.SendPropertyChanging();
+					this._SupervisionRemark = value;
+					this.SendPropertyChanged("SupervisionRemark");
+					this.OnSupervisionRemarkChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerRemark", DbType="VarChar(1000)")]
+		public string OwnerRemark
+		{
+			get
+			{
+				return this._OwnerRemark;
+			}
+			set
+			{
+				if ((this._OwnerRemark != value))
+				{
+					this.OnOwnerRemarkChanging(value);
+					this.SendPropertyChanging();
+					this._OwnerRemark = value;
+					this.SendPropertyChanged("OwnerRemark");
+					this.OnOwnerRemarkChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsPass", DbType="Int")]
+		public System.Nullable<int> SubcontractorIsPass
+		{
+			get
+			{
+				return this._SubcontractorIsPass;
+			}
+			set
+			{
+				if ((this._SubcontractorIsPass != value))
+				{
+					this.OnSubcontractorIsPassChanging(value);
+					this.SendPropertyChanging();
+					this._SubcontractorIsPass = value;
+					this.SendPropertyChanged("SubcontractorIsPass");
+					this.OnSubcontractorIsPassChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorIsPass", DbType="Int")]
+		public System.Nullable<int> ContractorIsPass
+		{
+			get
+			{
+				return this._ContractorIsPass;
+			}
+			set
+			{
+				if ((this._ContractorIsPass != value))
+				{
+					this.OnContractorIsPassChanging(value);
+					this.SendPropertyChanging();
+					this._ContractorIsPass = value;
+					this.SendPropertyChanged("ContractorIsPass");
+					this.OnContractorIsPassChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionIsPass", DbType="Int")]
+		public System.Nullable<int> SupervisionIsPass
+		{
+			get
+			{
+				return this._SupervisionIsPass;
+			}
+			set
+			{
+				if ((this._SupervisionIsPass != value))
+				{
+					this.OnSupervisionIsPassChanging(value);
+					this.SendPropertyChanging();
+					this._SupervisionIsPass = value;
+					this.SendPropertyChanged("SupervisionIsPass");
+					this.OnSupervisionIsPassChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerIsPass", DbType="Int")]
+		public System.Nullable<int> OwnerIsPass
+		{
+			get
+			{
+				return this._OwnerIsPass;
+			}
+			set
+			{
+				if ((this._OwnerIsPass != value))
+				{
+					this.OnOwnerIsPassChanging(value);
+					this.SendPropertyChanging();
+					this._OwnerIsPass = value;
+					this.SendPropertyChanged("OwnerIsPass");
+					this.OnOwnerIsPassChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -276836,8 +277047,6 @@ namespace Model
 		
 		private string _RestrictCondition;
 		
-		private System.Nullable<int> _ResponsibilityProposeSatate;
-		
 		private System.Nullable<int> _ResponsibilityConfirm;
 		
 		private System.Nullable<int> _ProposeConfirm;
@@ -276848,11 +277057,9 @@ namespace Model
 		
 		private System.Nullable<int> _OwnerConfirm;
 		
-		private System.Nullable<System.DateTime> _ProposeConfirmData;
-		
 		private System.Nullable<System.DateTime> _ResponsibilityConfirmData;
 		
-		private System.Nullable<System.DateTime> _ProposeHandleData;
+		private System.Nullable<System.DateTime> _ProposeConfirmData;
 		
 		private System.Nullable<System.DateTime> _GeneraConfirmData;
 		
@@ -276868,6 +277075,10 @@ namespace Model
 		
 		private System.Nullable<int> _Sort;
 		
+		private System.Nullable<int> _ResponsibilityProposeSatate;
+		
+		private System.Nullable<System.DateTime> _ProposeHandleData;
+		
 		private string _FourDecisionCode;
 		
     #region 可扩展性方法定义
@@ -276904,8 +277115,6 @@ namespace Model
     partial void OnRealityDestructionTimeChanged();
     partial void OnRestrictConditionChanging(string value);
     partial void OnRestrictConditionChanged();
-    partial void OnResponsibilityProposeSatateChanging(System.Nullable<int> value);
-    partial void OnResponsibilityProposeSatateChanged();
     partial void OnResponsibilityConfirmChanging(System.Nullable<int> value);
     partial void OnResponsibilityConfirmChanged();
     partial void OnProposeConfirmChanging(System.Nullable<int> value);
@@ -276916,12 +277125,10 @@ namespace Model
     partial void OnSupervisionConfirmChanged();
     partial void OnOwnerConfirmChanging(System.Nullable<int> value);
     partial void OnOwnerConfirmChanged();
-    partial void OnProposeConfirmDataChanging(System.Nullable<System.DateTime> value);
-    partial void OnProposeConfirmDataChanged();
     partial void OnResponsibilityConfirmDataChanging(System.Nullable<System.DateTime> value);
     partial void OnResponsibilityConfirmDataChanged();
-    partial void OnProposeHandleDataChanging(System.Nullable<System.DateTime> value);
-    partial void OnProposeHandleDataChanged();
+    partial void OnProposeConfirmDataChanging(System.Nullable<System.DateTime> value);
+    partial void OnProposeConfirmDataChanged();
     partial void OnGeneraConfirmDataChanging(System.Nullable<System.DateTime> value);
     partial void OnGeneraConfirmDataChanged();
     partial void OnSupervisionConfirmDataChanging(System.Nullable<System.DateTime> value);
@@ -276936,6 +277143,10 @@ namespace Model
     partial void OnAddTimeChanged();
     partial void OnSortChanging(System.Nullable<int> value);
     partial void OnSortChanged();
+    partial void OnResponsibilityProposeSatateChanging(System.Nullable<int> value);
+    partial void OnResponsibilityProposeSatateChanged();
+    partial void OnProposeHandleDataChanging(System.Nullable<System.DateTime> value);
+    partial void OnProposeHandleDataChanged();
     partial void OnFourDecisionCodeChanging(string value);
     partial void OnFourDecisionCodeChanged();
     #endregion
@@ -277245,26 +277456,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")]
-		public System.Nullable<int> ResponsibilityProposeSatate
-		{
-			get
-			{
-				return this._ResponsibilityProposeSatate;
-			}
-			set
-			{
-				if ((this._ResponsibilityProposeSatate != value))
-				{
-					this.OnResponsibilityProposeSatateChanging(value);
-					this.SendPropertyChanging();
-					this._ResponsibilityProposeSatate = value;
-					this.SendPropertyChanged("ResponsibilityProposeSatate");
-					this.OnResponsibilityProposeSatateChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirm", DbType="Int")]
 		public System.Nullable<int> ResponsibilityConfirm
 		{
@@ -277365,26 +277556,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")]
-		public System.Nullable<System.DateTime> ProposeConfirmData
-		{
-			get
-			{
-				return this._ProposeConfirmData;
-			}
-			set
-			{
-				if ((this._ProposeConfirmData != value))
-				{
-					this.OnProposeConfirmDataChanging(value);
-					this.SendPropertyChanging();
-					this._ProposeConfirmData = value;
-					this.SendPropertyChanged("ProposeConfirmData");
-					this.OnProposeConfirmDataChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirmData", DbType="DateTime")]
 		public System.Nullable<System.DateTime> ResponsibilityConfirmData
 		{
@@ -277405,22 +277576,22 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")]
-		public System.Nullable<System.DateTime> ProposeHandleData
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ProposeConfirmData
 		{
 			get
 			{
-				return this._ProposeHandleData;
+				return this._ProposeConfirmData;
 			}
 			set
 			{
-				if ((this._ProposeHandleData != value))
+				if ((this._ProposeConfirmData != value))
 				{
-					this.OnProposeHandleDataChanging(value);
+					this.OnProposeConfirmDataChanging(value);
 					this.SendPropertyChanging();
-					this._ProposeHandleData = value;
-					this.SendPropertyChanged("ProposeHandleData");
-					this.OnProposeHandleDataChanged();
+					this._ProposeConfirmData = value;
+					this.SendPropertyChanged("ProposeConfirmData");
+					this.OnProposeConfirmDataChanged();
 				}
 			}
 		}
@@ -277565,6 +277736,46 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")]
+		public System.Nullable<int> ResponsibilityProposeSatate
+		{
+			get
+			{
+				return this._ResponsibilityProposeSatate;
+			}
+			set
+			{
+				if ((this._ResponsibilityProposeSatate != value))
+				{
+					this.OnResponsibilityProposeSatateChanging(value);
+					this.SendPropertyChanging();
+					this._ResponsibilityProposeSatate = value;
+					this.SendPropertyChanged("ResponsibilityProposeSatate");
+					this.OnResponsibilityProposeSatateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ProposeHandleData
+		{
+			get
+			{
+				return this._ProposeHandleData;
+			}
+			set
+			{
+				if ((this._ProposeHandleData != value))
+				{
+					this.OnProposeHandleDataChanging(value);
+					this.SendPropertyChanging();
+					this._ProposeHandleData = value;
+					this.SendPropertyChanged("ProposeHandleData");
+					this.OnProposeHandleDataChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FourDecisionCode", DbType="VarChar(20)")]
 		public string FourDecisionCode
 		{
@@ -278277,7 +278488,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
 		public string Remark
 		{
 			get
@@ -313162,6 +313373,164 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Report_CQMS_ProblemHandle")]
+	public partial class Report_CQMS_ProblemHandle : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _Id;
+		
+		private string _ReportId;
+		
+		private string _ReType;
+		
+		private string _UnitName;
+		
+		private string _ProblemDes;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnIdChanging(string value);
+    partial void OnIdChanged();
+    partial void OnReportIdChanging(string value);
+    partial void OnReportIdChanged();
+    partial void OnReTypeChanging(string value);
+    partial void OnReTypeChanged();
+    partial void OnUnitNameChanging(string value);
+    partial void OnUnitNameChanged();
+    partial void OnProblemDesChanging(string value);
+    partial void OnProblemDesChanged();
+    #endregion
+		
+		public Report_CQMS_ProblemHandle()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string Id
+		{
+			get
+			{
+				return this._Id;
+			}
+			set
+			{
+				if ((this._Id != value))
+				{
+					this.OnIdChanging(value);
+					this.SendPropertyChanging();
+					this._Id = value;
+					this.SendPropertyChanged("Id");
+					this.OnIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportId", DbType="NVarChar(50)")]
+		public string ReportId
+		{
+			get
+			{
+				return this._ReportId;
+			}
+			set
+			{
+				if ((this._ReportId != value))
+				{
+					this.OnReportIdChanging(value);
+					this.SendPropertyChanging();
+					this._ReportId = value;
+					this.SendPropertyChanged("ReportId");
+					this.OnReportIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReType", DbType="NChar(20)")]
+		public string ReType
+		{
+			get
+			{
+				return this._ReType;
+			}
+			set
+			{
+				if ((this._ReType != value))
+				{
+					this.OnReTypeChanging(value);
+					this.SendPropertyChanging();
+					this._ReType = value;
+					this.SendPropertyChanged("ReType");
+					this.OnReTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(100)")]
+		public string UnitName
+		{
+			get
+			{
+				return this._UnitName;
+			}
+			set
+			{
+				if ((this._UnitName != value))
+				{
+					this.OnUnitNameChanging(value);
+					this.SendPropertyChanging();
+					this._UnitName = value;
+					this.SendPropertyChanged("UnitName");
+					this.OnUnitNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemDes", DbType="NVarChar(100)")]
+		public string ProblemDes
+		{
+			get
+			{
+				return this._ProblemDes;
+			}
+			set
+			{
+				if ((this._ProblemDes != value))
+				{
+					this.OnProblemDesChanging(value);
+					this.SendPropertyChanging();
+					this._ProblemDes = value;
+					this.SendPropertyChanged("ProblemDes");
+					this.OnProblemDesChanged();
+				}
+			}
+		}
+		
+		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.Report_CqmsTarget")]
 	public partial class Report_CqmsTarget : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -349459,8 +349828,6 @@ namespace Model
 		
 		private EntitySet<Doc_DocManage> _Doc_DocManage;
 		
-		private EntitySet<Doc_DocManageApprove> _Doc_DocManageApprove;
-		
 		private EntitySet<Driver_DriverProgress> _Driver_DriverProgress;
 		
 		private EntitySet<Driver_DriverReport> _Driver_DriverReport;
@@ -350175,7 +350542,6 @@ namespace Model
 			this._DataBase_File = new EntitySet<DataBase_File>(new Action<DataBase_File>(this.attach_DataBase_File), new Action<DataBase_File>(this.detach_DataBase_File));
 			this._DataBase_StartWorkReport = new EntitySet<DataBase_StartWorkReport>(new Action<DataBase_StartWorkReport>(this.attach_DataBase_StartWorkReport), new Action<DataBase_StartWorkReport>(this.detach_DataBase_StartWorkReport));
 			this._Doc_DocManage = new EntitySet<Doc_DocManage>(new Action<Doc_DocManage>(this.attach_Doc_DocManage), new Action<Doc_DocManage>(this.detach_Doc_DocManage));
-			this._Doc_DocManageApprove = new EntitySet<Doc_DocManageApprove>(new Action<Doc_DocManageApprove>(this.attach_Doc_DocManageApprove), new Action<Doc_DocManageApprove>(this.detach_Doc_DocManageApprove));
 			this._Driver_DriverProgress = new EntitySet<Driver_DriverProgress>(new Action<Driver_DriverProgress>(this.attach_Driver_DriverProgress), new Action<Driver_DriverProgress>(this.detach_Driver_DriverProgress));
 			this._Driver_DriverReport = new EntitySet<Driver_DriverReport>(new Action<Driver_DriverReport>(this.attach_Driver_DriverReport), new Action<Driver_DriverReport>(this.detach_Driver_DriverReport));
 			this._Driver_DriverScheme = new EntitySet<Driver_DriverScheme>(new Action<Driver_DriverScheme>(this.attach_Driver_DriverScheme), new Action<Driver_DriverScheme>(this.detach_Driver_DriverScheme));
@@ -352567,19 +352933,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManageApprove_Sys_User", Storage="_Doc_DocManageApprove", ThisKey="UserId", OtherKey="ApproveMan", DeleteRule="NO ACTION")]
-		public EntitySet<Doc_DocManageApprove> Doc_DocManageApprove
-		{
-			get
-			{
-				return this._Doc_DocManageApprove;
-			}
-			set
-			{
-				this._Doc_DocManageApprove.Assign(value);
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Driver_DriverProgress_Sys_User", Storage="_Driver_DriverProgress", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")]
 		public EntitySet<Driver_DriverProgress> Driver_DriverProgress
 		{
@@ -357072,18 +357425,6 @@ namespace Model
 			entity.Sys_User = null;
 		}
 		
-		private void attach_Doc_DocManageApprove(Doc_DocManageApprove entity)
-		{
-			this.SendPropertyChanging();
-			entity.Sys_User = this;
-		}
-		
-		private void detach_Doc_DocManageApprove(Doc_DocManageApprove entity)
-		{
-			this.SendPropertyChanging();
-			entity.Sys_User = null;
-		}
-		
 		private void attach_Driver_DriverProgress(Driver_DriverProgress entity)
 		{
 			this.SendPropertyChanging();