diff --git a/CreateModel.bat b/CreateModel.bat
index 27ceb4a..2f27853 100644
--- a/CreateModel.bat
+++ b/CreateModel.bat
@@ -25,9 +25,9 @@ REM --------------
 
 @echo 设置.net控制台环境
 @echo.
-@call "%VS150%"
+@call "%VS100COMNTOOLS%"vsvars32.bat
 
-SqlMetal /views  /server:. /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model
+SqlMetal /views  /server:.\SQL2016 /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model
 
 @ECHO 完成
 pause
diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo
index d71bcc4..e210b64 100644
Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ
diff --git a/HJGL/FineUIPro.Web/Web.config b/HJGL/FineUIPro.Web/Web.config
index 9ecdad1..baa8804 100644
--- a/HJGL/FineUIPro.Web/Web.config
+++ b/HJGL/FineUIPro.Web/Web.config
@@ -9,7 +9,7 @@
     <section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
   </configSections>
   <connectionStrings>
-    <add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=Sh@nghai9;"/>
+    <add name="HJGLDBConnectionString" connectionString="Data Source=.\sql2016;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=1111;"/>
     <!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True"
       providerName="System.Data.SqlClient" />-->
   </connectionStrings>
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx
index 74cea81..82ab602 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx
@@ -11,11 +11,10 @@
     <form id="form1" runat="server">
             <f:PageManager ID="PageManager1" AutoSizePanelID="Grid1" runat="server" />
   <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="璇曞帇鍖呭鍏ラ敊璇棩蹇�" runat="server" EnableCollapse="false"
-      DataKeyNames="ID"  PageSize="100" AllowPaging="true" >
+      DataKeyNames="ID" EnableCheckBoxSelect="true" EnableMultiSelect="true" PageSize="100" AllowPaging="true" >
       <Columns>
           <f:RowNumberField />
-            <f:RenderField  ColumnID="batchNo"  Width="160px"   DataField="BatchNo" HeaderText="鎵规鍙�" />
-            <f:RenderField  ColumnID="RowId"  Width="160px"   DataField="RowId" HeaderText="琛屽彿" />
+           <f:RenderField  ColumnID="batchNo"  Width="160px"   DataField="BatchNo" HeaderText="鎵规鍙�" />
             <f:RenderField  ColumnID="TestPackageNo"  MinWidth="80"   DataField="TestPackageNo" HeaderText="璇曞帇鍖呯紪鍙�" />
             <f:RenderField  ColumnID="UnitCode"  MinWidth="80"   DataField="UnitCode" HeaderText="鍗曚綅浠ｇ爜" />
             <f:RenderField  ColumnID="InstallCode" MinWidth="80"  DataField="InstallCode" HeaderText="瑁呯疆缂栧彿" />
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx.cs
index 7e9d52a..7e4f63d 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx.cs
@@ -21,7 +21,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
         }
         void BindGrid()
         {
-            var list=Funs.DB.PTP_TestPackage_ImportErrorLog.Where(t=>t.BatchNo == batchNo).OrderBy(t=>t.RowId).ToList();
+            var list=Funs.DB.PTP_TestPackage_ImportErrorLog.Where(t=>t.BatchNo == batchNo).OrderBy(t=>t.TestPackageNo).ToList();
             this.Grid1.DataSource = list;
             this.Grid1.DataBind();
         }
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx
index 8815dce..daa41cd 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx
@@ -8,7 +8,8 @@
     <title>濮旀墭鍗曞鍏�</title>
     <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
     <style>
-        .f-grid-row .f-grid-cell-inner {
+        .f-grid-row .f-grid-cell-inner
+        {
             white-space: normal;
             word-break: break-all;
         }
@@ -16,79 +17,50 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" OnCustomEvent="PageManager1_CustomEvent" />
-        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
-            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
-            <Toolbars>
-                <f:Toolbar ID="Toolbar2" Position="Top" ToolbarAlign="Right" runat="server">
-                    <Items>
-                        <f:Button ID="btnAudit" Icon="ApplicationEdit" Text="瀹℃牳" runat="server" ToolTip="瀹℃牳" ValidateForms="SimpleForm1"
-                            OnClick="btnAudit_Click">
-                        </f:Button>
-                        <f:Button ID="btnImport" Icon="ApplicationGet" Text="瀵煎叆" runat="server" ToolTip="瀵煎叆" ValidateForms="SimpleForm1"
-                            OnClick="btnImport_Click">
-                        </f:Button>
-                        <f:Button ID="btnDownLoad" runat="server" Text="涓嬭浇妯℃澘" Icon="ApplicationGo" ToolTip="涓嬭浇妯℃澘" OnClick="btnDownLoad_Click">
-                        </f:Button>
-                        <%--<f:Button ID="btnOut" Icon="Pencil" runat="server" Text="瀵煎嚭" ToolTip="瀵煎嚭閿欒鍒楄〃" ValidateForms="SimpleForm1"
+    <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" OnCustomEvent="PageManager1_CustomEvent" />
+    <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+        BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+        <Toolbars>
+            <f:Toolbar ID="Toolbar2" Position="Top" ToolbarAlign="Right" runat="server">
+                <Items>
+                    <f:Button ID="btnAudit" Icon="ApplicationEdit" Text="瀹℃牳" runat="server" ToolTip="瀹℃牳" ValidateForms="SimpleForm1"
+                        OnClick="btnAudit_Click">
+                    </f:Button>
+                    <f:Button ID="btnImport" Icon="ApplicationGet" Text="瀵煎叆" runat="server" ToolTip="瀵煎叆" ValidateForms="SimpleForm1"
+                        OnClick="btnImport_Click">
+                    </f:Button>
+                    <f:Button ID="btnDownLoad" runat="server" Text="涓嬭浇妯℃澘" Icon="ApplicationGo"  ToolTip="涓嬭浇妯℃澘" OnClick="btnDownLoad_Click">
+                    </f:Button>
+                    <%--<f:Button ID="btnOut" Icon="Pencil" runat="server" Text="瀵煎嚭" ToolTip="瀵煎嚭閿欒鍒楄〃" ValidateForms="SimpleForm1"
                         OnClick="btnOut_Click" Hidden="true"></f:Button>--%>
-                    </Items>
-                </f:Toolbar>
-            </Toolbars>
-            <Rows>
-                <f:FormRow>
-                    <Items>
-                        <f:FileUpload runat="server" ID="fuAttachUrl" EmptyText="閫夋嫨瑕佸鍏ョ殑鏂囦欢" Label="閫夋嫨瑕佸鍏ョ殑鏂囦欢"
-                            LabelWidth="150px">
-                        </f:FileUpload>
-                    </Items>
-                </f:FormRow>
-                <f:FormRow>
-                    <Items>
-                        <f:HiddenField ID="hdFileName" runat="server">
-                        </f:HiddenField>
-                        <f:HiddenField ID="hdCheckResult" runat="server">
-                        </f:HiddenField>
-                        <f:Label ID="lbResult" runat="server" Label="瀹℃牳缁撴灉"></f:Label>
-                    </Items>
-                </f:FormRow>
-                <f:FormRow>
-                    <Items>
-                        <%--<f:Label ID="lblBottom" runat="server" Text="璇存槑锛氳鍒欐槸">
+                </Items>
+            </f:Toolbar>
+        </Toolbars>
+        <Rows>
+            <f:FormRow>
+                <Items>
+                    <f:FileUpload runat="server" ID="fuAttachUrl" EmptyText="閫夋嫨瑕佸鍏ョ殑鏂囦欢" Label="閫夋嫨瑕佸鍏ョ殑鏂囦欢"
+                        LabelWidth="150px">
+                    </f:FileUpload>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:HiddenField ID="hdFileName" runat="server">
+                    </f:HiddenField>
+                    <f:HiddenField ID="hdCheckResult" runat="server">
+                    </f:HiddenField>
+                    <f:Label ID="lbResult" runat="server" Label="瀹℃牳缁撴灉"></f:Label>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <%--<f:Label ID="lblBottom" runat="server" Text="璇存槑锛氳鍒欐槸">
                     </f:Label>--%>
-                    </Items>
-                </f:FormRow>
-            </Rows>
-            <Rows>
-                <f:FormRow>
-                    <Items>
-                        <f:Grid ID="Grid1" ShowBorder="true" Hidden="true" ShowHeader="false" Title="濮旀墭鍗曞鍏ラ敊璇棩蹇�" runat="server" EnableCollapse="false"
-                            DataKeyNames="ID"  PageSize="100" AllowPaging="true">
-                            <Columns>
-                                <f:RowNumberField />
-                                <f:RenderField ColumnID="RowID" Width="80px" DataField="RowID" HeaderText="琛屽彿" />
-                                <f:RenderField ColumnID="TrustBatchCode" MinWidth="80" DataField="TrustBatchCode" HeaderText="濮旀墭鍗曠紪鍙�" />
-                                <f:RenderField ColumnID="InstallCode" MinWidth="80" DataField="InstallCode" HeaderText="瑁呯疆缂栧彿" />
-                                <f:RenderField ColumnID="AreaCode" MinWidth="80" DataField="AreaCode" HeaderText="鍖哄煙缂栧彿" />
-                                <f:RenderField ColumnID="PipelineCode" MinWidth="80" DataField="PipelineCode" HeaderText="绠＄嚎鍙�" />
-                                <f:RenderField ColumnID="WeldJointCode" MinWidth="80" DataField="WeldJointCode" HeaderText="鐒婂彛鍙�" />
-                                <f:RenderField ColumnID="DetectionType" MinWidth="80" DataField="DetectionType" HeaderText="鎺激绫诲瀷" />
-                                <f:RenderField ColumnID="TrustDate" MinWidth="80" DataField="TrustDate" HeaderText="濮旀墭鏃ユ湡" />
-                                <f:RenderField ColumnID="UnitCode" MinWidth="80" DataField="UnitCode" HeaderText="妫�娴嬪崟浣嶇紪鍙�" />
-                                <f:RenderField ColumnID="SurfaceState" MinWidth="80" DataField="SurfaceState" HeaderText="琛ㄩ潰鐘舵��" />
-                                <f:RenderField ColumnID="Opportunity" MinWidth="80" DataField="Opportunity" HeaderText="妫�娴嬫椂鏈�" />
-                                <f:TemplateField  HeaderText="閿欒鍘熷洜" MinWidth="500">
-                                    <ItemTemplate>
-                                        <asp:Label ID="lablRemark" runat="server" Text='<%#Eval("Remark") %>'  ForeColor="Red"></asp:Label>
-                                    </ItemTemplate>
-                                </f:TemplateField>
-                                <f:RenderField ColumnID="CreatedTime" MinWidth="150" DataField="CreatedTime" HeaderText="瀵煎叆鏃堕棿" />
-                            </Columns>
-                        </f:Grid>
-                    </Items>
-                </f:FormRow>
-            </Rows>
-        </f:Form>
+                </Items>
+            </f:FormRow>
+        </Rows>
+    </f:Form>
     </form>
 </body>
 </html>
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.cs
index 962745a..f11f1dc 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.cs
@@ -4,13 +4,10 @@ using System.Data;
 using System.Data.OleDb;
 using System.IO;
 using System.Linq;
-using System.Web.Configuration;
 using System.Web.UI;
-using System.Web.UI.WebControls;
 using BLL;
 using FineUIPro.Web.common.ProjectSet;
 using FineUIPro.Web.Common.ProjectSet;
-using Model;
 
 namespace FineUIPro.Web.WeldingProcess.TrustManage
 {
@@ -91,19 +88,15 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
 
             if (ds.Tables.Count > 0)
             {
-                
+                string result = string.Empty;
                 List<Model.Batch_BatchTrust> trustList= new List<Model.Batch_BatchTrust>();
                 var units = from x in Funs.DB.Base_Unit select x;
                 var area = from x in Funs.DB.Project_WorkArea where x.ProjectId == this.CurrUser.LoginProjectId select x;
                 var installation = from x in Funs.DB.Project_Installation where x.ProjectId == this.CurrUser.LoginProjectId select x;
                 var trustIn = from x in Funs.DB.View_TrustBathcIn where x.ProjectId == this.CurrUser.LoginProjectId select x;
                 var pipeList = from x in Funs.DB.Pipeline_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId select x;
-                List<Model.TrustBatchImportErrorLog> logListData = new List<Model.TrustBatchImportErrorLog>();
-                string BatchNo = DateTime.Now.ToString("yyyyMMddHHmmss");
                 for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
                 {
-                    string result = string.Empty;
-                    var log=new Model.TrustBatchImportErrorLog();
                     string col0 = ds.Tables[0].Rows[i][0].ToString().Trim();
                     string col1 = ds.Tables[0].Rows[i][1].ToString().Trim();
                     string col2 = ds.Tables[0].Rows[i][2].ToString().Trim();
@@ -114,33 +107,18 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                     string col7 = ds.Tables[0].Rows[i][7].ToString().Trim();
                     string col8 = ds.Tables[0].Rows[i][8].ToString().Trim();
                     string col9 = ds.Tables[0].Rows[i][9].ToString().Trim();
-                    log.Id = SQLHelper.GetNewID(typeof(TrustBatchImportErrorLog));
-                    log.RowID = (i + 2);
-                    log.BatchNo = BatchNo;
-                    log.TrustBatchCode = col0;
-                    log.InstallCode = col1;
-                    log.AreaCode = col2;
-                    log.PipelineCode= col3;
-                    log.WeldJointCode=col4;
-                    log.DetectionType=col5;
-                    log.TrustDate = col6;
-                    log.UnitCode= col7;
-                    log.SurfaceState= col8;
-                    log.Opportunity= col9;
-                    log.CreatedTime = DateTime.Now;
-
                     Model.Batch_BatchTrust t = new Model.Batch_BatchTrust();
 
                     if (string.IsNullOrEmpty(col0))
                     {
-                        result += "濮旀墭鍗曞彿姝ら」涓哄繀濉」锛�" + "|";
+                        result += "绗�" + (i + 2).ToString() + "琛�," + "濮旀墭鍗曞彿" + "," + "姝ら」涓哄繀濉」锛�" + "|";
                     }
                     else
                     {
                         var oldTrust = Funs.DB.Batch_BatchTrust.FirstOrDefault(x => x.TrustBatchCode == col0);
                         if (oldTrust != null)
                         {
-                            result += "濮旀墭鍗曞彿 [" + col0 + "]宸插瓨鍦紒" + "|";
+                            result += "绗�" + (i + 2).ToString() + "琛�," + "濮旀墭鍗曞彿" + "," + "[" + col0 + "]宸插瓨鍦紒" + "|";
                         }
                         else
                         {
@@ -154,7 +132,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         Model.Project_Installation ins = installation.FirstOrDefault(x => x.InstallationCode == col1);
                         if (ins == null)
                         {
-                            result += "瑁呯疆缂栧彿 [" + col1 + "]涓嶅瓨鍦紒" + "|";
+                            result += "绗�" + (i + 2).ToString() + "琛�," + "瑁呯疆缂栧彿" + "," + "[" + col1 + "]涓嶅瓨鍦紒" + "|";
                         }
                         else
                         {
@@ -164,7 +142,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                     }
                     else
                     {
-                        result += "瑁呯疆缂栧彿姝ら」涓哄繀濉」锛�" + "|";
+                        result += "绗�" + (i + 2).ToString() + "琛�," + "瑁呯疆缂栧彿" + "," + "姝ら」涓哄繀濉」锛�" + "|";
                     }
 
                     string workAreaId = string.Empty;
@@ -173,7 +151,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         Model.Project_WorkArea workArea = area.FirstOrDefault(x => x.WorkAreaCode == col2 && x.InstallationId == installationId);
                         if (workArea == null)
                         {
-                            result += "鍖哄煙缂栧彿 [" + col2 + "]涓嶅瓨鍦紒" + "|";
+                            result += "绗�" + (i + 2).ToString() + "琛�," + "鍖哄煙缂栧彿" + "," + "[" + col2 + "]涓嶅瓨鍦紒" + "|";
                         }
                         else
                         {
@@ -183,7 +161,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                     }
                     else
                     {
-                        result += "鍖哄煙缂栧彿姝ら」涓哄繀濉」锛�" + "|";
+                        result += "绗�" + (i + 2).ToString() + "琛�," + "鍖哄煙缂栧彿" + "," + "姝ら」涓哄繀濉」锛�" + "|";
                     }
 
                     string pipelineId = string.Empty;
@@ -192,7 +170,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         var pipe = pipeList.FirstOrDefault(x => x.PipelineCode == col3 && x.WorkAreaId == workAreaId);
                         if (pipe == null)
                         {
-                            result += "璇ュ尯鍩熺绾垮彿 [" + col3 + "]涓嶅瓨鍦紒" + "|";
+                            result += "绗�" + (i + 2).ToString() + "琛�," + "璇ュ尯鍩熺绾垮彿" + "," + "[" + col3 + "]涓嶅瓨鍦紒" + "|";
                         }
                         else
                         {
@@ -202,7 +180,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                     }
                     else
                     {
-                        result += "绠＄嚎鍙锋椤逛负蹇呭～椤癸紒" + "|";
+                        result += "绗�" + (i + 2).ToString() + "琛�," + "绠＄嚎鍙�" + "," + "姝ら」涓哄繀濉」锛�" + "|";
                     }
 
                     string weldJointId = string.Empty;
@@ -211,7 +189,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         var weldJoint = from x in Funs.DB.Pipeline_WeldJoint where x.PipelineId == pipelineId && x.WeldJointCode == col4 select x;
                         if (weldJoint.Count() == 0)
                         {
-                            result += "鐒婂彛鍙� [" + col4 + "]涓嶅瓨鍦紒" + "|";
+                            result += "绗�" + (i + 2).ToString() + "琛�," + "鐒婂彛鍙�" + "," + "[" + col4 + "]涓嶅瓨鍦紒" + "|";
                         }
 
                         else if (weldJoint.Count() == 1)
@@ -222,12 +200,12 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         }
                         else
                         {
-                            result += "鐒婂彛鍙� [" + col4 + "]閲嶅锛�" + "|";
+                            result += "绗�" + (i + 2).ToString() + "琛�," + "鐒婂彛鍙�" + "," + "[" + col4 + "]閲嶅锛�" + "|";
                         }
                     }
                     else
                     {
-                        result += "鐒婂彛鍙锋椤逛负蹇呭～椤癸紒" + "|";
+                        result += "绗�" + (i + 2).ToString() + "琛�," + "鐒婂彛鍙�" + "," + "姝ら」涓哄繀濉」锛�" + "|";
                     }
 
                     string ndeId = string.Empty;
@@ -236,7 +214,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         var nde = Funs.DB.Base_DetectionType.FirstOrDefault(x => x.DetectionTypeCode == col5);
                         if (nde == null)
                         {
-                            result += "鎺激绫诲瀷[" + col5 + "]閿欒锛�" + "|";
+                            result += "绗�" + (i + 2).ToString() + "琛�," + "鎺激绫诲瀷" + "," + "[" + col5 + "]閿欒锛�" + "|";
                         }
 
                         else
@@ -247,19 +225,19 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                     }
                     else
                     {
-                        result += "鎺激绫诲瀷姝ら」涓哄繀濉」锛�" + "|";
+                        result += "绗�" + (i + 2).ToString() + "琛�," + "鎺激绫诲瀷" + "," + "姝ら」涓哄繀濉」锛�" + "|";
                     }
 
                     var pointBatchItem = trustIn.FirstOrDefault(x => x.InstallationId == installationId && x.WorkAreaId == workAreaId && x.PipelineId == pipelineId && x.WeldJointId == weldJointId && x.DetectionTypeId == ndeId);
                     if (pointBatchItem == null)
                     {
-                        result += "妫�楠屾壒涓笉瀛樺湪瀵瑰簲鐒婂彛淇℃伅"  + "|";
+                        result += "绗�" + (i + 2).ToString() + "琛�," + "妫�楠屾壒涓笉瀛樺湪瀵瑰簲鐒婂彛淇℃伅"  + "|";
                     }
                     else
                     {
                         if (pointBatchItem.TrustBatchItemId != null)
                         {
-                            result += "鐒婂彛宸插鎵�" + "|";
+                            result += "绗�" + (i + 2).ToString() + "琛�," + "鐒婂彛宸插鎵�" + "|";
                         }
                         else
                         {
@@ -276,12 +254,12 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         }
                         catch (Exception)
                         {
-                            result += "濮旀墭鏃ユ湡 [" + col6 + "]閿欒锛�" + "|";
+                            result += "绗�" + (i + 2).ToString() + "琛�," + "濮旀墭鏃ユ湡" + "," + "[" + col6 + "]閿欒锛�" + "|";
                         }
                     }
                     else
                     {
-                        result += "濮旀墭鏃ユ湡姝ら」涓哄繀濉」锛�" + "|";
+                        result += "绗�" + (i + 2).ToString() + "琛�," + "濮旀墭鏃ユ湡" + "," + "姝ら」涓哄繀濉」锛�" + "|";
                     }
 
                     if (!string.IsNullOrEmpty(col7))
@@ -289,7 +267,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         Model.Base_Unit unit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitCode == col7);
                         if (unit == null)
                         {
-                            result += "妫�娴嬪崟浣嶇紪鍙穂" + col7 + "]閿欒锛�" + "|";
+                            result += "绗�" + (i + 2).ToString() + "琛�," + "妫�娴嬪崟浣嶇紪鍙�" + "," + "[" + col7 + "]閿欒锛�" + "|";
                         }
                         else
                         {
@@ -298,35 +276,31 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                     }
                     else
                     {
-                        result += "妫�娴嬪崟浣嶆椤逛负蹇呭～椤癸紒" + "|";
+                        result += "绗�" + (i + 2).ToString() + "琛�," + "妫�娴嬪崟浣�" + "," + "姝ら」涓哄繀濉」锛�" + "|";
                     }
 
                     if (!string.IsNullOrEmpty(col8))
                     {
                         if (col8!= "鎵撶（" && col8 != "鏈哄姞宸�" && col8 != "鍠风爞" && col8 != "婕嗛潰")
                         {
-                            result += "琛ㄩ潰妫�娴嬮渶褰曞叆锛氭墦纾ㄣ�佹満鍔犲伐銆佸柗鐮傘�佹紗闈�" + "|";
+                            result += "绗�" + (i + 2).ToString() + "琛�," + "琛ㄩ潰妫�娴嬮渶褰曞叆锛氭墦纾ㄣ�佹満鍔犲伐銆佸柗鐮傘�佹紗闈�" + "|";
                         }
                     }
                     if (!string.IsNullOrEmpty(col9))
                     {
                         if (col9 != "鐒婂悗" && col9 != "鎵撶（鍚�" && col9 != "鐑鐞嗗悗" && col9 != "鍧″彛鍑嗗" && col9 != "娓呮牴鍚�" && col9 != "鍘嬪姏璇曢獙鍚�" && col9 != "鍏朵粬")
                         {
-                            result += "妫�娴嬫椂鏈洪渶褰曞叆锛氱剨鍚庛�佹墦纾ㄥ悗銆佺儹澶勭悊鍚庛�佸潯鍙ｅ噯澶囥�佹竻鏍瑰悗銆佸帇鍔涜瘯楠屽悗銆佸叾浠�" + "|";
+                            result += "绗�" + (i + 2).ToString() + "琛�," + "妫�娴嬫椂鏈洪渶褰曞叆锛氱剨鍚庛�佹墦纾ㄥ悗銆佺儹澶勭悊鍚庛�佸潯鍙ｅ噯澶囥�佹竻鏍瑰悗銆佸帇鍔涜瘯楠屽悗銆佸叾浠�" + "|";
                         }
                     }
 
-                    log.Remark = result;
-                    logListData.Add(log);
                     trustList.Add(t);
                 }
 
                 var trustCodeList=trustList.Select(p=>p.TrustBatchCode).Distinct();
                 foreach (var trustCode in trustCodeList)
                 {
-                    string result = string.Empty;
                     var t = from x in trustList where x.TrustBatchCode == trustCode select x;
-                    var logInfo = logListData.FirstOrDefault(x => x.TrustBatchCode == trustCode);
                     if (t.Select(x => x.InstallationId).Distinct().Count() > 1)
                     {
                         result += "濮旀墭鍗�" + trustCode + "瑁呯疆涓嶄竴鑷�" + "|";
@@ -355,18 +329,17 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                     {
                         result += "濮旀墭鍗�" + trustCode + "濮旀墭鏃ユ湡涓嶄竴鑷�" + "|";
                     }
-                    if (logInfo != null)
-                    {
-                        logInfo.Remark += result;
-                    }
                 }
-                
-                if (logListData.Where(t=>t.Remark!="").Any())
+
+                if (!string.IsNullOrEmpty(result))
                 {
-                    Funs.DB.TrustBatchImportErrorLog.InsertAllOnSubmit(logListData);
-                    Funs.DB.SubmitChanges();
-                    this.Grid1.Hidden = false;
-                    this.BindGrid1(BatchNo);
+                    if (result.Contains("|"))
+                    {
+                        result = result.Substring(0, result.LastIndexOf("|"));
+                    }
+                    errorInfos = result;
+
+                    lbResult.Text = result;
                 }
                 else
                 {
@@ -378,12 +351,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
 
 
         }
-        void BindGrid1(string batchNo)
-        {
-            var result = Funs.DB.TrustBatchImportErrorLog.Where(t=>t.BatchNo== batchNo).OrderBy(t=>t.RowID).ToList();
-            this.Grid1.DataSource = result;
-            this.Grid1.DataBind();
-        }
+
         #endregion
 
         #region 瀵煎叆
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.designer.cs
index a33067c..e92d605 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.designer.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.designer.cs
@@ -112,23 +112,5 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Label lbResult;
-
-        /// <summary>
-        /// Grid1 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.Grid Grid1;
-
-        /// <summary>
-        /// lablRemark 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label lablRemark;
     }
 }
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx
index 4d07f97..dd1c81a 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx
@@ -227,7 +227,7 @@
     </f:Window>
     <f:Window ID="Window4" Title="濮旀墭鍗曞鍏�" Hidden="true" EnableIFrame="true"
      EnableMaximize="true" Target="Parent" EnableResize="true" runat="server" IsModal="false" OnClose="Window4_Close" 
-     CloseAction="HidePostBack" Width="1200px" Height="640px">
+     CloseAction="HidePostBack" Width="1024px" Height="640px">
      </f:Window>
         <f:Menu ID="Menu1" runat="server">
             <f:MenuButton ID="btnMenuCancel" OnClick="btnMenuCancel_Click" EnablePostBack="true"
diff --git a/HJGL/Model/Model.cs b/HJGL/Model/Model.cs
index 8f2cc39..bd40617 100644
--- a/HJGL/Model/Model.cs
+++ b/HJGL/Model/Model.cs
@@ -263,9 +263,6 @@ namespace Model
     partial void InsertTemplate_Files(Template_Files instance);
     partial void UpdateTemplate_Files(Template_Files instance);
     partial void DeleteTemplate_Files(Template_Files instance);
-    partial void InsertTrustBatchImportErrorLog(TrustBatchImportErrorLog instance);
-    partial void UpdateTrustBatchImportErrorLog(TrustBatchImportErrorLog instance);
-    partial void DeleteTrustBatchImportErrorLog(TrustBatchImportErrorLog instance);
     partial void InsertWelder_ProjectWelder(Welder_ProjectWelder instance);
     partial void UpdateWelder_ProjectWelder(Welder_ProjectWelder instance);
     partial void DeleteWelder_ProjectWelder(Welder_ProjectWelder instance);
@@ -931,14 +928,6 @@ namespace Model
 			}
 		}
 		
-		public System.Data.Linq.Table<TrustBatchImportErrorLog> TrustBatchImportErrorLog
-		{
-			get
-			{
-				return this.GetTable<TrustBatchImportErrorLog>();
-			}
-		}
-		
 		public System.Data.Linq.Table<View_Base_PipingClassDetail> View_Base_PipingClassDetail
 		{
 			get
@@ -22510,12 +22499,12 @@ namespace Model
 		
 		private string _DetectionStandard;
 		
+		private string _Tabler;
+		
 		private string _Remark;
 		
 		private System.Nullable<System.DateTime> _CreatedTime;
 		
-		private string _Tabler;
-		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -22534,12 +22523,12 @@ namespace Model
     partial void OnUnitIdChanged();
     partial void OnDetectionStandardChanging(string value);
     partial void OnDetectionStandardChanged();
+    partial void OnTablerChanging(string value);
+    partial void OnTablerChanged();
     partial void OnRemarkChanging(string value);
     partial void OnRemarkChanged();
     partial void OnCreatedTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnCreatedTimeChanged();
-    partial void OnTablerChanging(string value);
-    partial void OnTablerChanged();
     #endregion
 		
 		public PMI_Delegation()
@@ -22607,7 +22596,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
 		public string ProjectId
 		{
 			get
@@ -22687,6 +22676,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Tabler", DbType="NVarChar(50)")]
+		public string Tabler
+		{
+			get
+			{
+				return this._Tabler;
+			}
+			set
+			{
+				if ((this._Tabler != value))
+				{
+					this.OnTablerChanging(value);
+					this.SendPropertyChanging();
+					this._Tabler = value;
+					this.SendPropertyChanged("Tabler");
+					this.OnTablerChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(255)")]
 		public string Remark
 		{
@@ -22727,26 +22736,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Tabler", DbType="NVarChar(50)")]
-		public string Tabler
-		{
-			get
-			{
-				return this._Tabler;
-			}
-			set
-			{
-				if ((this._Tabler != value))
-				{
-					this.OnTablerChanging(value);
-					this.SendPropertyChanging();
-					this._Tabler = value;
-					this.SendPropertyChanged("Tabler");
-					this.OnTablerChanged();
-				}
-			}
-		}
-		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -22786,10 +22775,10 @@ namespace Model
 		
 		private int _Status;
 		
-		private string _ReportNo;
-		
 		private System.Nullable<System.DateTime> _CheckTime;
 		
+		private string _ReportNo;
+		
 		private System.Nullable<System.DateTime> _ReportTime;
 		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
@@ -22808,10 +22797,10 @@ namespace Model
     partial void OnAcceptanceChanged();
     partial void OnStatusChanging(int value);
     partial void OnStatusChanged();
-    partial void OnReportNoChanging(string value);
-    partial void OnReportNoChanged();
     partial void OnCheckTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnCheckTimeChanged();
+    partial void OnReportNoChanging(string value);
+    partial void OnReportNoChanged();
     partial void OnReportTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnReportTimeChanged();
     #endregion
@@ -22921,7 +22910,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="status", Storage="_Status", DbType="Int NOT NULL")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="Int NOT NULL")]
 		public int Status
 		{
 			get
@@ -22941,26 +22930,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportNo", Storage="_ReportNo", DbType="NVarChar(50)")]
-		public string ReportNo
-		{
-			get
-			{
-				return this._ReportNo;
-			}
-			set
-			{
-				if ((this._ReportNo != value))
-				{
-					this.OnReportNoChanging(value);
-					this.SendPropertyChanging();
-					this._ReportNo = value;
-					this.SendPropertyChanged("ReportNo");
-					this.OnReportNoChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")]
 		public System.Nullable<System.DateTime> CheckTime
 		{
@@ -22981,6 +22950,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportNo", Storage="_ReportNo", DbType="NVarChar(50)")]
+		public string ReportNo
+		{
+			get
+			{
+				return this._ReportNo;
+			}
+			set
+			{
+				if ((this._ReportNo != value))
+				{
+					this.OnReportNoChanging(value);
+					this.SendPropertyChanging();
+					this._ReportNo = value;
+					this.SendPropertyChanged("ReportNo");
+					this.OnReportNoChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportTime", Storage="_ReportTime", DbType="DateTime")]
 		public System.Nullable<System.DateTime> ReportTime
 		{
@@ -32272,404 +32261,6 @@ namespace Model
 		}
 	}
 	
-	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.TrustBatchImportErrorLog")]
-	public partial class TrustBatchImportErrorLog : INotifyPropertyChanging, INotifyPropertyChanged
-	{
-		
-		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
-		
-		private string _Id;
-		
-		private string _BatchNo;
-		
-		private System.Nullable<int> _RowID;
-		
-		private string _TrustBatchCode;
-		
-		private string _InstallCode;
-		
-		private string _AreaCode;
-		
-		private string _PipelineCode;
-		
-		private string _WeldJointCode;
-		
-		private string _DetectionType;
-		
-		private string _TrustDate;
-		
-		private string _UnitCode;
-		
-		private string _SurfaceState;
-		
-		private string _Opportunity;
-		
-		private string _Remark;
-		
-		private System.Nullable<System.DateTime> _CreatedTime;
-		
-    #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 OnBatchNoChanging(string value);
-    partial void OnBatchNoChanged();
-    partial void OnRowIDChanging(System.Nullable<int> value);
-    partial void OnRowIDChanged();
-    partial void OnTrustBatchCodeChanging(string value);
-    partial void OnTrustBatchCodeChanged();
-    partial void OnInstallCodeChanging(string value);
-    partial void OnInstallCodeChanged();
-    partial void OnAreaCodeChanging(string value);
-    partial void OnAreaCodeChanged();
-    partial void OnPipelineCodeChanging(string value);
-    partial void OnPipelineCodeChanged();
-    partial void OnWeldJointCodeChanging(string value);
-    partial void OnWeldJointCodeChanged();
-    partial void OnDetectionTypeChanging(string value);
-    partial void OnDetectionTypeChanged();
-    partial void OnTrustDateChanging(string value);
-    partial void OnTrustDateChanged();
-    partial void OnUnitCodeChanging(string value);
-    partial void OnUnitCodeChanged();
-    partial void OnSurfaceStateChanging(string value);
-    partial void OnSurfaceStateChanged();
-    partial void OnOpportunityChanging(string value);
-    partial void OnOpportunityChanged();
-    partial void OnRemarkChanging(string value);
-    partial void OnRemarkChanged();
-    partial void OnCreatedTimeChanging(System.Nullable<System.DateTime> value);
-    partial void OnCreatedTimeChanged();
-    #endregion
-		
-		public TrustBatchImportErrorLog()
-		{
-			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="_BatchNo", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
-		public string BatchNo
-		{
-			get
-			{
-				return this._BatchNo;
-			}
-			set
-			{
-				if ((this._BatchNo != value))
-				{
-					this.OnBatchNoChanging(value);
-					this.SendPropertyChanging();
-					this._BatchNo = value;
-					this.SendPropertyChanged("BatchNo");
-					this.OnBatchNoChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RowID", DbType="Int")]
-		public System.Nullable<int> RowID
-		{
-			get
-			{
-				return this._RowID;
-			}
-			set
-			{
-				if ((this._RowID != value))
-				{
-					this.OnRowIDChanging(value);
-					this.SendPropertyChanging();
-					this._RowID = value;
-					this.SendPropertyChanged("RowID");
-					this.OnRowIDChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrustBatchCode", DbType="NVarChar(50)")]
-		public string TrustBatchCode
-		{
-			get
-			{
-				return this._TrustBatchCode;
-			}
-			set
-			{
-				if ((this._TrustBatchCode != value))
-				{
-					this.OnTrustBatchCodeChanging(value);
-					this.SendPropertyChanging();
-					this._TrustBatchCode = value;
-					this.SendPropertyChanged("TrustBatchCode");
-					this.OnTrustBatchCodeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallCode", DbType="NVarChar(50)")]
-		public string InstallCode
-		{
-			get
-			{
-				return this._InstallCode;
-			}
-			set
-			{
-				if ((this._InstallCode != value))
-				{
-					this.OnInstallCodeChanging(value);
-					this.SendPropertyChanging();
-					this._InstallCode = value;
-					this.SendPropertyChanged("InstallCode");
-					this.OnInstallCodeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AreaCode", DbType="NVarChar(50)")]
-		public string AreaCode
-		{
-			get
-			{
-				return this._AreaCode;
-			}
-			set
-			{
-				if ((this._AreaCode != value))
-				{
-					this.OnAreaCodeChanging(value);
-					this.SendPropertyChanging();
-					this._AreaCode = value;
-					this.SendPropertyChanged("AreaCode");
-					this.OnAreaCodeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")]
-		public string PipelineCode
-		{
-			get
-			{
-				return this._PipelineCode;
-			}
-			set
-			{
-				if ((this._PipelineCode != value))
-				{
-					this.OnPipelineCodeChanging(value);
-					this.SendPropertyChanging();
-					this._PipelineCode = value;
-					this.SendPropertyChanged("PipelineCode");
-					this.OnPipelineCodeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointCode", DbType="NVarChar(50)")]
-		public string WeldJointCode
-		{
-			get
-			{
-				return this._WeldJointCode;
-			}
-			set
-			{
-				if ((this._WeldJointCode != value))
-				{
-					this.OnWeldJointCodeChanging(value);
-					this.SendPropertyChanging();
-					this._WeldJointCode = value;
-					this.SendPropertyChanged("WeldJointCode");
-					this.OnWeldJointCodeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DetectionType", DbType="NVarChar(50)")]
-		public string DetectionType
-		{
-			get
-			{
-				return this._DetectionType;
-			}
-			set
-			{
-				if ((this._DetectionType != value))
-				{
-					this.OnDetectionTypeChanging(value);
-					this.SendPropertyChanging();
-					this._DetectionType = value;
-					this.SendPropertyChanged("DetectionType");
-					this.OnDetectionTypeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrustDate", DbType="NVarChar(50)")]
-		public string TrustDate
-		{
-			get
-			{
-				return this._TrustDate;
-			}
-			set
-			{
-				if ((this._TrustDate != value))
-				{
-					this.OnTrustDateChanging(value);
-					this.SendPropertyChanging();
-					this._TrustDate = value;
-					this.SendPropertyChanged("TrustDate");
-					this.OnTrustDateChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitCode", DbType="NVarChar(50)")]
-		public string UnitCode
-		{
-			get
-			{
-				return this._UnitCode;
-			}
-			set
-			{
-				if ((this._UnitCode != value))
-				{
-					this.OnUnitCodeChanging(value);
-					this.SendPropertyChanging();
-					this._UnitCode = value;
-					this.SendPropertyChanged("UnitCode");
-					this.OnUnitCodeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SurfaceState", DbType="NVarChar(50)")]
-		public string SurfaceState
-		{
-			get
-			{
-				return this._SurfaceState;
-			}
-			set
-			{
-				if ((this._SurfaceState != value))
-				{
-					this.OnSurfaceStateChanging(value);
-					this.SendPropertyChanging();
-					this._SurfaceState = value;
-					this.SendPropertyChanged("SurfaceState");
-					this.OnSurfaceStateChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Opportunity", DbType="NVarChar(50)")]
-		public string Opportunity
-		{
-			get
-			{
-				return this._Opportunity;
-			}
-			set
-			{
-				if ((this._Opportunity != value))
-				{
-					this.OnOpportunityChanging(value);
-					this.SendPropertyChanging();
-					this._Opportunity = value;
-					this.SendPropertyChanged("Opportunity");
-					this.OnOpportunityChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
-		public string Remark
-		{
-			get
-			{
-				return this._Remark;
-			}
-			set
-			{
-				if ((this._Remark != value))
-				{
-					this.OnRemarkChanging(value);
-					this.SendPropertyChanging();
-					this._Remark = value;
-					this.SendPropertyChanged("Remark");
-					this.OnRemarkChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")]
-		public System.Nullable<System.DateTime> CreatedTime
-		{
-			get
-			{
-				return this._CreatedTime;
-			}
-			set
-			{
-				if ((this._CreatedTime != value))
-				{
-					this.OnCreatedTimeChanging(value);
-					this.SendPropertyChanging();
-					this._CreatedTime = value;
-					this.SendPropertyChanged("CreatedTime");
-					this.OnCreatedTimeChanged();
-				}
-			}
-		}
-		
-		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.View_Base_PipingClassDetail")]
 	public partial class View_Base_PipingClassDetail
 	{
@@ -39555,8 +39146,6 @@ namespace Model
 		
 		private string _ProjectId;
 		
-		private System.Nullable<bool> _IsPMI;
-		
 		private string _PipelineCode;
 		
 		private string _PipelineId;
@@ -39687,22 +39276,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="isPMI", Storage="_IsPMI", DbType="Bit")]
-		public System.Nullable<bool> IsPMI
-		{
-			get
-			{
-				return this._IsPMI;
-			}
-			set
-			{
-				if ((this._IsPMI != value))
-				{
-					this._IsPMI = value;
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(100)")]
 		public string PipelineCode
 		{
@@ -41711,6 +41284,8 @@ namespace Model
 		
 		private string _PipingClassCode;
 		
+		private string _PIPClassCode;
+		
 		private string _WeldingDate;
 		
 		private System.Nullable<bool> _IsCancel;
@@ -41725,8 +41300,6 @@ namespace Model
 		
 		private string _DetectionType;
 		
-		private string _PIPClassCode;
-		
 		private string _PageNum;
 		
 		public View_Pipeline_WeldJoint()
@@ -42821,6 +42394,22 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PIPClassCode", DbType="NVarChar(50)")]
+		public string PIPClassCode
+		{
+			get
+			{
+				return this._PIPClassCode;
+			}
+			set
+			{
+				if ((this._PIPClassCode != value))
+				{
+					this._PIPClassCode = value;
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldingDate", DbType="VarChar(100)")]
 		public string WeldingDate
 		{
@@ -42933,22 +42522,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PIPClassCode", DbType="NVarChar(50)")]
-		public string PIPClassCode
-		{
-			get
-			{
-				return this._PIPClassCode;
-			}
-			set
-			{
-				if ((this._PIPClassCode != value))
-				{
-					this._PIPClassCode = value;
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PageNum", DbType="NVarChar(10)")]
 		public string PageNum
 		{
@@ -47512,7 +47085,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WelderIds", DbType="VarChar(1000)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WelderIds", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
 		public string WelderIds
 		{
 			get