diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx
index 8301b5ec..9b9cadc1 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx
@@ -15,8 +15,8 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="设备材料报验" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="InspectionEquipmentId" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="InspectionEquipmentId" AllowSorting="true" SortField="InspectionDate"
-                    SortDirection="DESC" OnSort="Grid1_Sort"
+                    ClicksToEdit="2" DataIDField="InspectionEquipmentId" AllowSorting="true" SortField="RemarkCode"
+                    SortDirection="ASC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
                     <Toolbars>
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx
index 65d9065b..f66409a9 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx
@@ -15,8 +15,8 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="NCR管理" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="NCRManagementId" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="NCRManagementId" AllowSorting="true" SortField="IssuedDate"
-                    SortDirection="DESC" OnSort="Grid1_Sort"
+                    ClicksToEdit="2" DataIDField="NCRManagementId" AllowSorting="true" SortField="RemarkCode"
+                    SortDirection="ASC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
                     <Toolbars>
@@ -130,7 +130,7 @@
         </f:Window>
         <f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
-            Width="700px" Height="560px">
+            Width="1200px" Height="600px">
         </f:Window>
            <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
             EnableMaximize="true" Target="Parent" EnableResize="false" runat="server"
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs
index 12d353a7..df6a125a 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs
@@ -286,7 +286,7 @@ namespace FineUIPro.Web.Comprehensive
         /// <param name="e"></param>
         protected void btnImport_Click(object sender, EventArgs e)
         {
-            PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("NCRManagementDataIn.aspx", "导入 - ")));
+            PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("NCRManagementDataInNew.aspx", "导入 - ")));
         }
         #endregion
 
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx
new file mode 100644
index 00000000..b900485a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx
@@ -0,0 +1,190 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NCRManagementDataInNew.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.NCRManagementDataInNew" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>NCR导入</title>
+    <style type="text/css">
+        .f-grid-row.red {
+            background-color: LightCoral;
+        }
+
+        .Label {
+            font-size: larger;
+            font-weight: bold;
+        }
+    </style>
+
+
+    <style type="text/css">
+        /*定义父容器*/
+        .content {
+            width: 550px;
+            height: 30px;
+            background: #E4F1FB;
+            margin: 0 auto;
+        }
+        /*定义进度条*/
+        .box {
+            width: 0px;
+            height: 30px;
+            line-height: 30px;
+            text-align: center;
+            background: #3BAAE3;
+            color: #fff;
+        }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:HiddenField ID="id" ClientIDMode="Static" runat="server"></f:HiddenField>
+        <f:Panel ID="Panel1" runat="server" Margin="2px" BodyPadding="2px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
+                    <Items>
+                        <f:HiddenField ID="hdfileName" runat="server"></f:HiddenField>
+                        <f:FileUpload ID="FileExcel" runat="server" Label="数据文件" EmptyText="请上传EXCEl格式文件" Width="350px" LabelWidth="90px" LabelAlign="Right"></f:FileUpload>
+                        <f:Button ID="imgbtnImport" runat="server" Text="上传" ToolTip="文件上传" OnClick="imgbtnImport_Click"></f:Button>
+                        <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
+                        <%--<f:CheckBox ID="ckUpdate" runat="server" Text="更新导入"></f:CheckBox>--%>
+                        <f:Button ID="btnSave" runat="server" Text="保存" ToolTip="审核保存" Icon="SystemSave" OnClick="btnSave_Click"></f:Button>
+                        <f:Button ID="btnRefresh" runat="server" ClientIDMode="Static" Text="刷新" Icon="SystemSave" OnClick="btnRefresh_Click" Hidden="true"></f:Button>
+
+                        <f:Button ID="btnAllDelete" runat="server" Icon="Delete" Text="删除记录" ToolTip="删除当前人所有临时导入记录" ConfirmText="删除当前人所有临时导入记录？"
+                            ConfirmTarget="Top" OnClick="btnAllDelete_Click">
+                        </f:Button>
+                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="TableGo"
+                            EnableAjax="false" DisableControlBeforePostBack="false" Hidden="true">
+                        </f:Button>
+                        <f:Button ID="imgbtnUpload" runat="server" Icon="DiskDownload" Text="模板下载" OnClick="imgbtnUpload_Click" EnableAjaxLoading="false"></f:Button>
+                        <%--<f:Button ID="lkAchievements" runat="server" Icon="DiskDownload" Text="导入说明" OnClick="lkAchievements_Click" EnableAjaxLoading="false"></f:Button>--%>
+                    </Items>
+                    <Items>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据导入" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="TempId" AllowCellEditing="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableColumnLines="true" ClicksToEdit="2" DataIDField="TempId" AllowSorting="true"
+                    SortField="RowNo" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Columns>
+                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
+                        <f:RenderField Width="70px" HeaderText="行号" ColumnID="RowNo" DataField="RowNo" SortField="RowNo"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="220px" HeaderText="发出单位" ColumnID="Value1" DataField="Value1" SortField="Value1"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="80px" HeaderText="专业名称" ColumnID="Value2" DataField="Value2" SortField="Value2"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:WindowField ColumnID="Value3" HeaderTextAlign="Center" TextAlign="Left" Width="220px" WindowID="Window1" HeaderText="NCR单号"
+                            DataTextField="Value3" DataIFrameUrlFields="TempId" DataIFrameUrlFormatString="NCRManagementDataInNewEdit.aspx?TempId={0}"
+                            Title="NCR单号" DataToolTipField="ToopValue" SortField="Value3">
+                        </f:WindowField>
+                        <f:RenderField Width="100px" HeaderText="单位工程名称" ColumnID="Value4" DataField="Value4" SortField="Value4"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="120px" HeaderText="主要内容" ColumnID="Value5" DataField="Value5" SortField="Value5"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="90px" HeaderText="问题类别" ColumnID="Value6" DataField="Value6" SortField="Value6"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="120px" HeaderText="改进措施" ColumnID="Value7" DataField="Value7" SortField="Value7"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" HeaderText="下发日期" ColumnID="Value8" DataField="Value8" SortField="Value8"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" HeaderText="接收单位" ColumnID="Value9" DataField="Value9" SortField="Value9"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" HeaderText="实施状态" ColumnID="Value10" DataField="Value10" SortField="Value10"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="80px" HeaderText="要求关闭日期" ColumnID="Value11" DataField="Value11" SortField="Value11"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
+                        </f:RenderField>
+                        <f:RenderField Width="110px" HeaderText="完成日期" ColumnID="Value12" DataField="Value12" SortField="Value12"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" HeaderText="责任人" ColumnID="Value13" DataField="Value13" SortField="Value13"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
+                        </f:RenderField>  
+                        <f:RenderField Width="80px" HeaderText="监督人" ColumnID="Value14" DataField="Value14" SortField="Value14"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
+                        </f:RenderField> 
+                        <f:RenderField Width="80px" HeaderText="标志编号" ColumnID="Value15" DataField="Value15" SortField="Value15"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
+                        </f:RenderField>    
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <PageItems>
+                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                        </f:ToolbarSeparator>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                            <f:ListItem Text="10" Value="10" />
+                            <f:ListItem Text="15" Value="15" Selected="true" />
+                            <f:ListItem Text="20" Value="20" />
+                            <f:ListItem Text="25" Value="25" />
+                        </f:DropDownList>
+                        <f:Label Label="错误记录数" runat="server" ID="lbDataCout" CssClass="Label" LabelAlign="right" LabelWidth="120px"></f:Label>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="数据信息" Hidden="true" EnableIFrame="true"
+            EnableMaximize="true" Target="Top" EnableResize="true" runat="server"
+            IsModal="true" Width="1200px" Height="600px">
+        </f:Window>
+        <f:Window ID="Window2" Hidden="true" runat="server" MinHeight="30px"
+            Target="Parent" ShowHeader="false" BodyPadding="0" Margin="0"
+            IsModal="true" Width="550px" Height="32px">
+            <Items>
+                <f:ContentPanel ShowBorder="false" Height="30px" ShowHeader="false" ID="ContentPanel3" runat="server">
+                    <div class="content" id="content">
+                        <div class="box" id="box"></div>
+                    </div>
+                </f:ContentPanel>
+            </Items>
+        </f:Window>
+        <f:Menu ID="Menu1" ClientIDMode="Static" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
+                runat="server" Text="编辑" Icon="TableEdit">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
+                ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server" Text="删除" Icon="Delete">
+            </f:MenuButton>
+        </f:Menu>
+        <asp:ScriptManager ID="ScriptManager2" runat="server" EnablePageMethods="true">
+            <Scripts>
+                <asp:ScriptReference Path="~/res/DataInTable.js" />
+            </Scripts>
+        </asp:ScriptManager>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx.cs
new file mode 100644
index 00000000..ea7b9fe6
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx.cs
@@ -0,0 +1,624 @@
+using BLL;
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using FineUIPro.Web.DataShow;
+
+namespace FineUIPro.Web.CQMS.Comprehensive
+{
+    public partial class NCRManagementDataInNew : PageBase
+    {
+        /// <summary>
+        /// 错误集合
+        /// </summary>
+        public static string errorInfos = string.Empty;
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                if (percent == null)
+                {
+                    percent = new Dictionary<string, int>();
+                }
+                this.id.Text = this.CurrUser.UserId;
+                this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格
+                this.BindGrid();
+            }
+            else if (GetRequestEventArgument() == "reloadGrid")
+            {
+                BindGrid();
+            }
+        }
+        #endregion
+
+        #region 绑定数据
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"SELECT TempId,ProjectId,UserId,Time,RowNo,ToopValue,Value1,Value2,Value3,Value4,Value5,Value6,Value7,Value8,Value9,Value10"
+                + @" ,Value11,Value12,Value13,Value14,Value15,Value16,Value17,Value18,Value19,Value20"
+                + @",ToopValue,Type"
+                + @" FROM Sys_CQMS_DataInTemp  "
+                + @" WHERE ProjectId=@ProjectId AND UserId=@UserId AND Type=@Type";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@UserId", this.CurrUser.UserId));
+            listStr.Add(new SqlParameter("@Type", "NCR"));
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+
+            var dataInTempAll = from x in Funs.DB.Sys_CQMS_DataInTemp
+                                where x.ProjectId == this.CurrUser.LoginProjectId && x.UserId == this.CurrUser.UserId && x.Type == "NCR"
+                                select x;
+            for (int i = 0; i < Grid1.Rows.Count; i++)
+            {
+                var dataInTemp = dataInTempAll.FirstOrDefault(x => x.TempId == Grid1.Rows[i].DataKeys[0].ToString());
+                if (dataInTemp != null)
+                {
+                    if (!string.IsNullOrEmpty(dataInTemp.ToopValue))
+                    {
+                        Grid1.Rows[i].RowCssClass = "red";
+                    }
+                }
+            }
+            var errData = from x in dataInTempAll where x.ToopValue != null select x;
+            this.lbDataCout.Text = errData.Count().ToString();
+        }
+        #endregion
+
+        #region 双击事件
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("NCRManagementDataInNewEdit.aspx?TempId={0}", Grid1.SelectedRowID, "维护 - ")));
+        }
+        #endregion
+
+        #region 导入信息 维护
+        /// <summary>
+        /// 导入信息编辑
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuEdit_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("NCRManagementDataInNewEdit.aspx?TempId={0}", Grid1.SelectedRowID, "维护 - ")));
+        }
+
+        /// <summary>
+        /// 删除按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuDelete_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+            {
+                string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                BLL.Sys_CQMS_DataInTempService.DeleteDataInTempByDataInTempID(rowID);
+            }
+
+            ShowNotify("删除成功！", MessageBoxIcon.Success);
+            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 ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 文件上传
+        /// <summary>
+        /// 文件上传
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void imgbtnImport_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (this.FileExcel.HasFile == false)
+                {
+                    ShowNotify("请选择Excel文件!", MessageBoxIcon.Warning);
+                    return;
+                }
+                string IsXls = Path.GetExtension(this.FileExcel.FileName).ToString().Trim().ToLower();
+                if (IsXls != ".xls" && IsXls != ".xlsx")
+                {
+                    ShowNotify("只能选择Excel文件!", MessageBoxIcon.Warning);
+                    return;
+                }
+                string rootPath = Server.MapPath("~/");
+                string initFullPath = rootPath + Const.ExcelUrl;
+                if (!Directory.Exists(initFullPath))
+                {
+                    Directory.CreateDirectory(initFullPath);
+                }
+                //指定上传文件名称
+                this.hdfileName.Text = BLL.Funs.GetNewFileName() + IsXls;
+                //上传文件路径
+                string filePath = initFullPath + this.hdfileName.Text;
+                //文件上传服务器
+                this.FileExcel.PostedFile.SaveAs(filePath);
+                //文件上传服务器后的名称
+                string fileName = rootPath + Const.ExcelUrl + this.hdfileName.Text;
+                //读取Excel
+                DataSet ds = NPOIHelper.ExcelToDataSet(fileName, out errorInfos, true);
+                //验证Excel读取是否有误
+                if (!string.IsNullOrEmpty(errorInfos))
+                {
+                    ShowNotify(errorInfos, MessageBoxIcon.Warning);
+                    return;
+                }
+
+                if (ds.Tables.Count > 0)
+                {
+                    for (int i = 1; i < ds.Tables[0].Rows.Count; i++)
+                    {
+                        Sys_CQMS_DataInTemp newDataInTemp = new Sys_CQMS_DataInTemp();
+                        newDataInTemp.TempId = SQLHelper.GetNewID(typeof(Model.Sys_CQMS_DataInTemp));
+                        newDataInTemp.ProjectId = this.CurrUser.LoginProjectId;
+                        newDataInTemp.UserId = this.CurrUser.UserId;
+                        newDataInTemp.Time = System.DateTime.Now;
+                        newDataInTemp.Type = "NCR";
+                        newDataInTemp.RowNo = i + 2;
+                        newDataInTemp.Value1 = ds.Tables[0].Rows[i][0].ToString();
+                        newDataInTemp.Value2 = ds.Tables[0].Rows[i][1].ToString();
+                        newDataInTemp.Value3 = ds.Tables[0].Rows[i][2].ToString();
+                        newDataInTemp.Value4 = ds.Tables[0].Rows[i][3].ToString();
+                        newDataInTemp.Value5 = ds.Tables[0].Rows[i][4].ToString();
+                        newDataInTemp.Value6 = ds.Tables[0].Rows[i][5].ToString();
+                        newDataInTemp.Value7 = ds.Tables[0].Rows[i][6].ToString();
+                        newDataInTemp.Value8 = ds.Tables[0].Rows[i][7].ToString();
+                        newDataInTemp.Value9 = ds.Tables[0].Rows[i][8].ToString();
+                        newDataInTemp.Value10 = ds.Tables[0].Rows[i][9].ToString();
+                        newDataInTemp.Value11 = ds.Tables[0].Rows[i][10].ToString();
+                        newDataInTemp.Value12 = ds.Tables[0].Rows[i][11].ToString();
+                        newDataInTemp.Value13 = ds.Tables[0].Rows[i][12].ToString();
+                        newDataInTemp.Value14 = ds.Tables[0].Rows[i][13].ToString();
+                        newDataInTemp.Value15 = ds.Tables[0].Rows[i][14].ToString();
+
+                        BLL.Sys_CQMS_DataInTempService.AddDataInTemp(newDataInTemp);
+                    }
+                    this.BindGrid();
+                    ShowNotify("数据已导入临时表！", MessageBoxIcon.Success);
+                }
+                else
+                {
+                    Alert.ShowInTop("导入数据为空！", MessageBoxIcon.Success);
+                    return;
+                }
+            }
+            catch (Exception ex)
+            {
+                Alert.ShowInTop("'" + ex.Message + "'", MessageBoxIcon.Warning);
+            }
+        }
+        #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("NCR管理" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = System.Text.Encoding.UTF8;
+            Response.Write(GetGridTableHtml(Grid1));
+            Response.End();
+        }
+        #endregion        
+
+        #region 保存审核事件
+        /// <summary>
+        /// 保存审核事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            Thread t = new Thread(new ThreadStart(() => { btnSaveMethod(this.CurrUser.LoginProjectId, this.CurrUser.UserId, "NCR"); }));
+            t.Start();
+            if (percent.ContainsKey(this.CurrUser.UserId))
+            {
+                percent[CurrUser.UserId] = 0;
+            }
+            else
+            {
+                percent.Add(CurrUser.UserId, 0);
+
+            }
+            PageContext.RegisterStartupScript("printX()");
+        }
+        protected void btnRefresh_Click(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+
+        protected void btnSaveMethod(string LoginProjectId, string UserId, string IsPDMS)
+        {
+            var oldViewInfos = from x in Funs.DB.Comprehensive_NCRManagement
+                               where x.ProjectId == this.CurrUser.LoginProjectId
+                               select x;
+
+            var units = from x in Funs.DB.Base_Unit
+                        join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId
+                        where y.ProjectId == this.CurrUser.LoginProjectId
+                        select x;
+
+            var cns = from x in Funs.DB.Base_CNProfessional select x;
+
+            var unitWorks = from x in Funs.DB.WBS_UnitWork
+                            where x.ProjectId == this.CurrUser.LoginProjectId
+                            && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
+                            select x;
+
+            var users = from x in Funs.DB.Project_ProjectUser
+                        join y in Funs.DB.Sys_User on x.UserId equals y.UserId
+                        where x.ProjectId == this.CurrUser.LoginProjectId
+                        && x.UnitId == BLL.Const.UnitId_CWCEC
+                        select y;
+
+            var dataInTemp = from x in Funs.DB.Sys_CQMS_DataInTemp
+                             where x.ProjectId == LoginProjectId && x.UserId == UserId && x.Type == "NCR"
+                             select x;
+            int okCount = 0;
+            int i = 0;
+            int ir = dataInTemp.Count();
+            string erreMessage = "";
+            foreach (var tempData in dataInTemp)
+            {
+                if (tempData != null)
+                {
+                    i++;
+                    percent[UserId] = (int)(100 * i / ir);
+                    string errInfo = string.Empty;
+
+                    Model.Comprehensive_NCRManagement Ins = new Model.Comprehensive_NCRManagement();
+                    if (!string.IsNullOrEmpty(tempData.Value1))
+                    {
+                        var unit = units.FirstOrDefault(x => x.UnitName == tempData.Value1);
+                        if (unit == null)
+                        {
+                            errInfo += "发出单位[" + tempData.Value1 + "]不存在；";
+                        }
+                        else
+                        {
+                            Ins.SendUnit = unit.UnitId;
+                        }
+                    }
+                    else
+                    {
+                        errInfo += "发出单位为必填项；";
+                    }
+                    if (!string.IsNullOrEmpty(tempData.Value2))
+                    {
+                        var cn = cns.Where(x => x.ProfessionalName == tempData.Value2).FirstOrDefault();
+                        if (cn == null)
+                        {
+                            errInfo += "专业名称[" + tempData.Value2 + "]不存在；";
+                        }
+                        else
+                        {
+                            Ins.CNProfessionalId = cn.CNProfessionalId;
+                        }
+                    }
+                    else
+                    {
+                        errInfo += "专业名称为必填项；";
+                    }
+                    if (!string.IsNullOrEmpty(tempData.Value3))
+                    {
+                        Ins.NCRCode = tempData.Value3;
+                    }
+                    else
+                    {
+                        errInfo += "NCR单号为必填项；";
+                    }
+                    if (!string.IsNullOrEmpty(tempData.Value4))
+                    {
+                        string unitIds = string.Empty;
+                        string[] reunit = tempData.Value4.Split(',');
+                        foreach (string unitWork in reunit)
+                        {
+                            var u = unitWorks.Where(x => x.UnitWorkName == unitWork.Trim()).FirstOrDefault();
+                            if (u == null)
+                            {
+                                errInfo += "单位工程名称[" + unitWork.Trim() + "]不存在；";
+                            }
+                            else
+                            {
+                                var q = BLL.UnitWorkService.GetUnitWorkByUnitWorkName(this.CurrUser.LoginProjectId, unitWork.Trim()).UnitWorkId;
+                                unitIds += q + ",";
+                            }
+                        }
+                        if (!string.IsNullOrEmpty(unitIds))
+                        {
+                            unitIds = unitIds.Substring(0, unitIds.LastIndexOf(","));
+                        }
+                        Ins.UnitWorkId = unitIds;
+                    }
+                    if (!string.IsNullOrEmpty(tempData.Value5))//主要内容
+                    {
+                        Ins.Contents = tempData.Value5;
+                    }
+                    if (!string.IsNullOrEmpty(tempData.Value6.Trim()))
+                    {
+                        if (tempData.Value6.Trim() != "过程监督不到位" && tempData.Value6.Trim() != "质量缺陷" && tempData.Value6.Trim() != "质量管理问题" && tempData.Value6.Trim() != "不按设计要求施工" && tempData.Value6.Trim() != "不按程序施工" && tempData.Value6.Trim() != "成品保护不到位")
+                        {
+                            errInfo += "问题类别[" + tempData.Value6.Trim() + "]错误；";
+                        }
+                        else
+                        {
+                            Ins.Problem = tempData.Value6.Trim();
+                        }
+                    }
+                    if (!string.IsNullOrEmpty(tempData.Value7.Trim()))//改进措施
+                    {
+                        Ins.Measure = tempData.Value7.Trim();
+                    }
+                    if (!string.IsNullOrEmpty(tempData.Value8.Trim()))
+                    {
+                        try
+                        {
+                            Ins.IssuedDate = Funs.GetNewDateTime(tempData.Value8.Trim());
+                            if (Ins.IssuedDate == null)
+                            {
+                                errInfo += "下发日期[" + tempData.Value8.Trim() + "]错误；";
+                            }
+                        }
+                        catch (Exception)
+                        {
+                            errInfo += "下发日期[" + tempData.Value8.Trim() + "]错误；";
+                        }
+                    }
+                    if (!string.IsNullOrEmpty(tempData.Value9.Trim()))
+                    {
+                        string unitIds = string.Empty;
+                        string[] reunit = tempData.Value9.Split(',');
+                        foreach (string unitName in reunit)
+                        {
+                            var u = units.Where(x => x.UnitName == unitName.Trim()).FirstOrDefault();
+                            if (u == null)
+                            {
+                                errInfo += "接收单位[" + unitName.Trim() + "]不存在；";
+                            }
+                            else
+                            {
+                                unitIds += u.UnitId + ",";
+                            }
+                        }
+                        if (!string.IsNullOrEmpty(unitIds))
+                        {
+                            unitIds = unitIds.Substring(0, unitIds.LastIndexOf(","));
+                        }
+                        Ins.ReceiveUnit = unitIds;
+                    }
+                    if (!string.IsNullOrEmpty(tempData.Value10.Trim()))
+                    {
+                        if (tempData.Value10.Trim() != "整改中" && tempData.Value10.Trim() != "已闭合")
+                        {
+                            errInfo += "实时状态[" + tempData.Value10.Trim() + "]错误；";
+                        }
+                        else
+                        {
+                            Ins.ImplementationFrontState = tempData.Value10.Trim();
+                        }
+                    }
+                    if (!string.IsNullOrEmpty(tempData.Value11))
+                    {
+                        try
+                        {
+                            Ins.ClosedDate = Funs.GetNewDateTime(tempData.Value11);
+                            if (Ins.ClosedDate == null)
+                            {
+                                errInfo += "要求关闭日期[" + tempData.Value11.Trim() + "]错误；";
+                            }
+                        }
+                        catch (Exception)
+                        {
+                            errInfo += "要求关闭日期[" + tempData.Value11.Trim() + "]错误；";
+                        }
+                    }
+                    if (!string.IsNullOrEmpty(tempData.Value12))
+                    {
+                        try
+                        {
+                            Ins.CompleteDate = Funs.GetNewDateTime(tempData.Value12);
+                            if (Ins.CompleteDate == null)
+                            {
+                                errInfo += "完成日期[" + tempData.Value12.Trim() + "]错误；";
+                            }
+                        }
+                        catch (Exception)
+                        {
+                            errInfo += "完成日期[" + tempData.Value12.Trim() + "]错误；";
+                        }
+                    }
+                    if (!string.IsNullOrEmpty(tempData.Value13.Trim()))//责任人
+                    {
+                        Ins.ResponsibleMan = tempData.Value13.Trim();
+                    }
+                    if (!string.IsNullOrEmpty(tempData.Value14.Trim()))//监督人
+                    {
+                        var user = users.FirstOrDefault(x => x.UserName == tempData.Value14.Trim());
+                        if (user != null)
+                        {
+                            Ins.Supervisor = user.UserId;
+                        }
+                        else
+                        {
+                            errInfo += "监督人[" + tempData.Value14.Trim() + "]错误；";
+                        }
+                    }
+                    if (!string.IsNullOrEmpty(tempData.Value15))
+                    {
+                        try
+                        {
+                            Ins.RemarkCode = Convert.ToInt32(tempData.Value15);
+                        }
+                        catch (Exception)
+                        {
+                            errInfo += "标志编号[" + tempData.Value15 + "]格式错误；";
+                        }
+                    }
+                    else
+                    {
+                        errInfo += "标志编号为必填项；";
+                    }
+                    if (string.IsNullOrEmpty(errInfo)) ////所有信息正确的话 插入数据
+                    {
+                        Ins.ProjectId = LoginProjectId;
+                        Ins.Status = BLL.Const.Comprehensive_Compile;
+                        Ins.CompileMan = this.CurrUser.UserId;
+                        var isExitISOValue = oldViewInfos.FirstOrDefault(x => x.RemarkCode == Funs.GetNewIntOrZero(tempData.Value15));
+                        if (isExitISOValue != null) ///已存在
+                        {
+                            Ins.NCRManagementId = isExitISOValue.NCRManagementId;
+                            BLL.NCRManagementService.UpdateNCRManagement(Ins);
+                        }
+                        else
+                        {
+                            Ins.NCRManagementId = SQLHelper.GetNewID(typeof(Model.Comprehensive_NCRManagement));
+                            BLL.NCRManagementService.AddNCRManagement(Ins);
+                        }
+                        BLL.Sys_CQMS_DataInTempService.DeleteDataInTempByDataInTempID(tempData.TempId);
+                        okCount++;
+                    }
+
+                    if (!string.IsNullOrEmpty(errInfo))
+                    {
+                        tempData.ToopValue = errInfo;
+                        BLL.Sys_CQMS_DataInTempService.UpdateDataInTemp(tempData);
+                        erreMessage += errInfo + ";";
+                    }
+                }
+            }
+        }
+        #endregion
+
+        #region 删除所有数据事件
+        /// <summary>
+        /// 删除所有数据事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAllDelete_Click(object sender, EventArgs e)
+        {
+            //先删除临时表中 该人员以前导入的数据
+            BLL.Sys_CQMS_DataInTempService.DeleteDataInTempByProjectIdUserId(this.CurrUser.LoginProjectId, this.CurrUser.UserId, "NCR");
+            this.BindGrid();
+            ShowNotify("删除成功！", MessageBoxIcon.Success);
+            this.lbDataCout.Text = string.Empty;
+        }
+        #endregion
+
+        #region 模版导入说明 下载
+        /// <summary>
+        /// 下载模版
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void imgbtnUpload_Click(object sender, EventArgs e)
+        {
+            string rootPath = Server.MapPath("~/");
+            string uploadfilepath = rootPath + Const.NCRManagementDataInUrl;
+            string filePath = Const.NCRManagementDataInUrl;
+            string fileName = Path.GetFileName(filePath);
+            FileInfo info = new FileInfo(uploadfilepath);
+            long fileSize = info.Length;
+            Response.ClearContent();
+            Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+            Response.ContentType = "excel/plain";
+            Response.ContentEncoding = System.Text.Encoding.UTF8;
+            Response.AddHeader("Content-Length", fileSize.ToString().Trim());
+            Response.TransmitFile(uploadfilepath, 0, fileSize);
+            Response.End();
+        }
+        #endregion
+
+        public static Dictionary<string, int> percent { get; set; }
+        public static Dictionary<string, string> url { get; set; }
+
+        [System.Web.Services.WebMethod]
+        public static int getPercent(string id)
+        {
+            return percent[id];
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx.designer.cs
new file mode 100644
index 00000000..fcb9cc48
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx.designer.cs
@@ -0,0 +1,249 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.Comprehensive {
+    
+    
+    public partial class NCRManagementDataInNew {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// id 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField id;
+        
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// hdfileName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdfileName;
+        
+        /// <summary>
+        /// FileExcel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FileUpload FileExcel;
+        
+        /// <summary>
+        /// imgbtnImport 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button imgbtnImport;
+        
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+        
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+        
+        /// <summary>
+        /// btnRefresh 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnRefresh;
+        
+        /// <summary>
+        /// btnAllDelete 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAllDelete;
+        
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+        
+        /// <summary>
+        /// imgbtnUpload 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button imgbtnUpload;
+        
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+        
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+        
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+        
+        /// <summary>
+        /// lbDataCout 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lbDataCout;
+        
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+        
+        /// <summary>
+        /// Window2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window2;
+        
+        /// <summary>
+        /// ContentPanel3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel3;
+        
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+        
+        /// <summary>
+        /// btnMenuEdit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuEdit;
+        
+        /// <summary>
+        /// btnMenuDelete 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDelete;
+        
+        /// <summary>
+        /// ScriptManager2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.ScriptManager ScriptManager2;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx
new file mode 100644
index 00000000..afc9e884
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx
@@ -0,0 +1,83 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NCRManagementDataInNewEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.NCRManagementDataInNewEdit" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
+                    <Items>
+                        <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ValidateForms="SimpleForm1"
+                            OnClick="btnSave_Click">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtValue1" Label="发出单位" ShowRedStar="true" Required="true" runat="server" FocusOnPageLoad="true" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:TextBox ID="txtValue2" Label="专业名称" ShowRedStar="true" Required="true" runat="server" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:TextBox ID="txtValue3" Label="NCR单号" ShowRedStar="true" Required="true" runat="server" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:TextBox ID="txtValue4" Label="单位工程名称" runat="server" LabelWidth="120px">
+                        </f:TextBox>
+
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtValue5" Label="主要内容" runat="server" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:TextBox ID="txtValue6" Label="问题类别" runat="server" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:TextBox ID="txtValue7" Label="改进措施" runat="server" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:TextBox ID="txtValue8" Label="下发日期" runat="server" LabelWidth="120px">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtValue9" Label="接收单位" runat="server" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:TextBox ID="txtValue10" Label="实施状态" runat="server" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:TextBox ID="txtValue11" Label="要求关闭日期" runat="server" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:TextBox ID="txtValue12" Label="完成日期" runat="server" LabelWidth="120px">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtValue13" Label="责任人" runat="server" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:TextBox ID="txtValue14" Label="监督人" runat="server" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:TextBox ID="txtValue15" Label="标志编号" runat="server" LabelWidth="120px" Required="true" ShowRedStar="true">
+                        </f:TextBox>
+                        <f:CheckBox ID="ckAll" runat="server" Checked="true" Text="是否批量修改"></f:CheckBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextArea runat="server" Label="错误信息" ID="lbErrCout" Readonly="true" LabelWidth="120px"></f:TextArea>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+        </f:Form>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.cs
new file mode 100644
index 00000000..2a1688cd
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.cs
@@ -0,0 +1,291 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.CQMS.Comprehensive
+{
+    public partial class NCRManagementDataInNewEdit : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 临时表主键
+        /// </summary>
+        public string TempId
+        {
+            get
+            {
+                return (string)ViewState["TempId"];
+            }
+            set
+            {
+                ViewState["TempId"] = value;
+            }
+        }
+        #endregion
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.TempId = Request.Params["TempId"];
+                this.txtValue1.Focus();
+                var dataInTemp = BLL.Sys_CQMS_DataInTempService.GetDataInTempByTempId(this.TempId);
+                if (dataInTemp != null)
+                {
+                    this.txtValue1.Text = dataInTemp.Value1;
+                    this.txtValue2.Text = dataInTemp.Value2;
+                    this.txtValue3.Text = dataInTemp.Value3;
+                    this.txtValue4.Text = dataInTemp.Value4;
+                    this.txtValue5.Text = dataInTemp.Value5;
+                    this.txtValue6.Text = dataInTemp.Value6;
+                    this.txtValue7.Text = dataInTemp.Value7;
+                    this.txtValue8.Text = dataInTemp.Value8;
+                    this.txtValue9.Text = dataInTemp.Value9;
+                    this.txtValue10.Text = dataInTemp.Value10;
+                    this.txtValue11.Text = dataInTemp.Value11;
+                    this.txtValue12.Text = dataInTemp.Value12;
+                    this.txtValue13.Text = dataInTemp.Value13;
+                    this.txtValue14.Text = dataInTemp.Value14;
+                    this.txtValue15.Text = dataInTemp.Value15;
+
+                    this.lbErrCout.Text = dataInTemp.ToopValue;
+                }
+            }
+        }
+        #endregion
+
+        #region 保存按钮
+        /// <summary>
+        /// 保存按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            var dataInTemp = BLL.Sys_CQMS_DataInTempService.GetDataInTempByTempId(this.TempId);
+            if (this.ckAll.Checked)
+            {
+                var allDataInTemp = from x in Funs.DB.Sys_CQMS_DataInTemp where x.ProjectId == this.CurrUser.LoginProjectId && x.UserId == this.CurrUser.UserId && x.Type == "NCR" select x;
+                if (dataInTemp.Value1 != this.txtValue1.Text.Trim())
+                {
+                    var tempValue1 = allDataInTemp.Where(x => x.Value1 == dataInTemp.Value1 || (x.Value1 == null && dataInTemp.Value1 == null));
+                    if (tempValue1 != null)
+                    {
+                        foreach (var item in tempValue1)
+                        {
+                            item.Value1 = this.txtValue1.Text.Trim();
+                            Funs.DB.SubmitChanges();
+                        }
+                    }
+                }
+                if (dataInTemp.Value2 != this.txtValue2.Text.Trim())
+                {
+                    var tempValue2 = allDataInTemp.Where(x => x.Value2 == dataInTemp.Value2 || (x.Value2 == null && dataInTemp.Value2 == null));
+                    if (tempValue2 != null)
+                    {
+                        foreach (var item in tempValue2)
+                        {
+                            item.Value2 = this.txtValue2.Text.Trim();
+                            Funs.DB.SubmitChanges();
+                        }
+                    }
+                }
+                if (dataInTemp.Value3 != this.txtValue3.Text.Trim())
+                {
+                    var tempValue3 = allDataInTemp.Where(x => x.Value3 == dataInTemp.Value3 || (x.Value3 == null && dataInTemp.Value3 == null));
+                    if (tempValue3 != null)
+                    {
+                        foreach (var item in tempValue3)
+                        {
+                            item.Value3 = this.txtValue3.Text.Trim();
+                            Funs.DB.SubmitChanges();
+                        }
+                    }
+                }
+                if (dataInTemp.Value5 != this.txtValue5.Text.Trim())
+                {
+                    var tempValue5 = allDataInTemp.Where(x => x.Value5 == dataInTemp.Value5 || (x.Value5 == null && dataInTemp.Value5 == null));
+                    if (tempValue5 != null)
+                    {
+                        foreach (var item in tempValue5)
+                        {
+                            item.Value5 = this.txtValue5.Text.Trim();
+                            Funs.DB.SubmitChanges();
+                        }
+                    }
+                }
+                if (dataInTemp.Value6 != this.txtValue6.Text.Trim())
+                {
+                    var tempValue6 = allDataInTemp.Where(x => x.Value6 == dataInTemp.Value6 || (x.Value6 == null && dataInTemp.Value6 == null));
+                    if (tempValue6 != null)
+                    {
+                        foreach (var item in tempValue6)
+                        {
+                            item.Value6 = this.txtValue6.Text.Trim();
+                            Funs.DB.SubmitChanges();
+                        }
+                    }
+                }
+                if (dataInTemp.Value7 != this.txtValue7.Text.Trim())
+                {
+                    var tempValue7 = allDataInTemp.Where(x => x.Value7 == dataInTemp.Value7 || (x.Value7 == null && dataInTemp.Value7 == null));
+                    if (tempValue7 != null)
+                    {
+                        foreach (var item in tempValue7)
+                        {
+                            item.Value7 = this.txtValue7.Text.Trim();
+                            Funs.DB.SubmitChanges();
+                        }
+                    }
+                }
+                if (dataInTemp.Value8 != this.txtValue8.Text.Trim())
+                {
+                    var tempValue8 = allDataInTemp.Where(x => x.Value8 == dataInTemp.Value8 || (x.Value8 == null && dataInTemp.Value8 == null));
+                    if (tempValue8 != null)
+                    {
+                        foreach (var item in tempValue8)
+                        {
+                            item.Value8 = this.txtValue8.Text.Trim();
+                            Funs.DB.SubmitChanges();
+                        }
+                    }
+                }
+                if (dataInTemp.Value9 != this.txtValue9.Text.Trim())
+                {
+                    var tempValue9 = allDataInTemp.Where(x => x.Value9 == dataInTemp.Value9 || (x.Value9 == null && dataInTemp.Value9 == null));
+                    if (tempValue9 != null)
+                    {
+                        foreach (var item in tempValue9)
+                        {
+                            item.Value9 = this.txtValue9.Text.Trim();
+                            Funs.DB.SubmitChanges();
+                        }
+                    }
+                }
+                if (dataInTemp.Value10 != this.txtValue10.Text.Trim())
+                {
+                    var tempValue10 = allDataInTemp.Where(x => x.Value10 == dataInTemp.Value10 || (x.Value10 == null && dataInTemp.Value10 == null));
+                    if (tempValue10 != null)
+                    {
+                        foreach (var item in tempValue10)
+                        {
+                            item.Value10 = this.txtValue10.Text.Trim();
+                            Funs.DB.SubmitChanges();
+                        }
+                    }
+                }
+                if (dataInTemp.Value11 != this.txtValue11.Text.Trim())
+                {
+                    var tempValue11 = allDataInTemp.Where(x => x.Value11 == dataInTemp.Value11 || (x.Value11 == null && dataInTemp.Value11 == null));
+                    if (tempValue11 != null)
+                    {
+                        foreach (var item in tempValue11)
+                        {
+                            item.Value11 = this.txtValue11.Text.Trim();
+                            Funs.DB.SubmitChanges();
+                        }
+                    }
+                }
+                if (dataInTemp.Value12 != this.txtValue12.Text.Trim())
+                {
+                    var tempValue12 = allDataInTemp.Where(x => x.Value12 == dataInTemp.Value12 || (x.Value12 == null && dataInTemp.Value12 == null));
+                    if (tempValue12 != null)
+                    {
+                        foreach (var item in tempValue12)
+                        {
+                            item.Value12 = this.txtValue12.Text.Trim();
+                            Funs.DB.SubmitChanges();
+                        }
+                    }
+                }
+                if (dataInTemp.Value13 != this.txtValue13.Text.Trim())
+                {
+                    var tempValue13 = allDataInTemp.Where(x => x.Value13 == dataInTemp.Value13 || (x.Value13 == null && dataInTemp.Value13 == null));
+                    if (tempValue13 != null)
+                    {
+                        foreach (var item in tempValue13)
+                        {
+                            item.Value13 = this.txtValue13.Text.Trim();
+                            Funs.DB.SubmitChanges();
+                        }
+                    }
+                }
+                if (dataInTemp.Value14 != this.txtValue14.Text.Trim())
+                {
+                    var tempValue14 = allDataInTemp.Where(x => x.Value14 == dataInTemp.Value14 || (x.Value14 == null && dataInTemp.Value14 == null));
+                    if (tempValue14 != null)
+                    {
+                        foreach (var item in tempValue14)
+                        {
+                            item.Value14 = this.txtValue14.Text.Trim();
+                            Funs.DB.SubmitChanges();
+                        }
+                    }
+                }
+                if (dataInTemp.Value15 != this.txtValue15.Text.Trim())
+                {
+                    var tempValue15 = allDataInTemp.Where(x => x.Value15 == dataInTemp.Value15 || (x.Value15 == null && dataInTemp.Value15 == null));
+                    if (tempValue15 != null)
+                    {
+                        foreach (var item in tempValue15)
+                        {
+                            item.Value15 = this.txtValue15.Text.Trim();
+                            Funs.DB.SubmitChanges();
+                        }
+                    }
+                }
+                var toopValue = allDataInTemp.Where(x => x.ToopValue == dataInTemp.ToopValue);
+                if (toopValue != null)
+                {
+                    foreach (var item in toopValue)
+                    {
+                        item.ToopValue = null;
+                        Funs.DB.SubmitChanges();
+                    }
+                }
+            }
+            else
+            {
+                Model.Sys_CQMS_DataInTemp newDataInTemp = new Model.Sys_CQMS_DataInTemp();
+                newDataInTemp.ProjectId = this.CurrUser.ProjectId;
+                newDataInTemp.UserId = this.CurrUser.UserId;
+                newDataInTemp.Time = System.DateTime.Now;
+                newDataInTemp.Type = "NCR";
+                newDataInTemp.Value1 = this.txtValue1.Text.Trim();
+                newDataInTemp.Value2 = this.txtValue2.Text.Trim();
+                newDataInTemp.Value3 = this.txtValue3.Text.Trim();
+                newDataInTemp.Value4 = this.txtValue4.Text.Trim();
+                newDataInTemp.Value5 = this.txtValue5.Text.Trim();
+                newDataInTemp.Value6 = this.txtValue6.Text.Trim();
+                newDataInTemp.Value7 = this.txtValue7.Text.Trim();
+                newDataInTemp.Value8 = this.txtValue8.Text.Trim();
+                newDataInTemp.Value9 = this.txtValue9.Text.Trim();
+                newDataInTemp.Value10 = this.txtValue10.Text.Trim();
+                newDataInTemp.Value11 = this.txtValue11.Text.Trim();
+                newDataInTemp.Value12 = this.txtValue12.Text.Trim();
+                newDataInTemp.Value13 = this.txtValue13.Text.Trim();
+                newDataInTemp.Value14 = this.txtValue14.Text.Trim();
+                newDataInTemp.Value15 = this.txtValue15.Text.Trim();
+                if (!string.IsNullOrEmpty(this.TempId))
+                {
+                    newDataInTemp.TempId = this.TempId;
+                    newDataInTemp.ToopValue = null;
+                    BLL.Sys_CQMS_DataInTempService.UpdateDataInTemp(newDataInTemp);
+                }
+            }
+            ShowNotify("信息修改完成！", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.designer.cs
new file mode 100644
index 00000000..d81bdf52
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.designer.cs
@@ -0,0 +1,222 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.Comprehensive {
+    
+    
+    public partial class NCRManagementDataInNewEdit {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+        
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+        
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+        
+        /// <summary>
+        /// txtValue1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue1;
+        
+        /// <summary>
+        /// txtValue2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue2;
+        
+        /// <summary>
+        /// txtValue3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue3;
+        
+        /// <summary>
+        /// txtValue4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue4;
+        
+        /// <summary>
+        /// txtValue5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue5;
+        
+        /// <summary>
+        /// txtValue6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue6;
+        
+        /// <summary>
+        /// txtValue7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue7;
+        
+        /// <summary>
+        /// txtValue8 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue8;
+        
+        /// <summary>
+        /// txtValue9 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue9;
+        
+        /// <summary>
+        /// txtValue10 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue10;
+        
+        /// <summary>
+        /// txtValue11 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue11;
+        
+        /// <summary>
+        /// txtValue12 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue12;
+        
+        /// <summary>
+        /// txtValue13 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue13;
+        
+        /// <summary>
+        /// txtValue14 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue14;
+        
+        /// <summary>
+        /// txtValue15 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue15;
+        
+        /// <summary>
+        /// ckAll 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox ckAll;
+        
+        /// <summary>
+        /// lbErrCout 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea lbErrCout;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/FakesAssemblies/ThoughtWorks.QRCode.Fakes.dll b/SGGL/FineUIPro.Web/FakesAssemblies/ThoughtWorks.QRCode.Fakes.dll
index 9277f882..e5384a2e 100644
Binary files a/SGGL/FineUIPro.Web/FakesAssemblies/ThoughtWorks.QRCode.Fakes.dll and b/SGGL/FineUIPro.Web/FakesAssemblies/ThoughtWorks.QRCode.Fakes.dll differ
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index f18ebe7c..2eaf6a4d 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -481,6 +481,8 @@
     <Content Include="CQMS\Comprehensive\NCRManagement.aspx" />
     <Content Include="CQMS\Comprehensive\NCRManagementApprove.aspx" />
     <Content Include="CQMS\Comprehensive\NCRManagementDataIn.aspx" />
+    <Content Include="CQMS\Comprehensive\NCRManagementDataInNew.aspx" />
+    <Content Include="CQMS\Comprehensive\NCRManagementDataInNewEdit.aspx" />
     <Content Include="CQMS\Comprehensive\NCRManagementEdit.aspx" />
     <Content Include="CQMS\Comprehensive\PersonItem.aspx" />
     <Content Include="CQMS\Comprehensive\PressurePipe.aspx" />
@@ -7824,6 +7826,20 @@
     <Compile Include="CQMS\Comprehensive\NCRManagementDataIn.aspx.designer.cs">
       <DependentUpon>NCRManagementDataIn.aspx</DependentUpon>
     </Compile>
+    <Compile Include="CQMS\Comprehensive\NCRManagementDataInNew.aspx.cs">
+      <DependentUpon>NCRManagementDataInNew.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\Comprehensive\NCRManagementDataInNew.aspx.designer.cs">
+      <DependentUpon>NCRManagementDataInNew.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\Comprehensive\NCRManagementDataInNewEdit.aspx.cs">
+      <DependentUpon>NCRManagementDataInNewEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\Comprehensive\NCRManagementDataInNewEdit.aspx.designer.cs">
+      <DependentUpon>NCRManagementDataInNewEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="CQMS\Comprehensive\NCRManagementEdit.aspx.cs">
       <DependentUpon>NCRManagementEdit.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>