From 9831d335da4c3c37ae40c0c11c4d1914c3058391 Mon Sep 17 00:00:00 2001
From: jackchenyang <874821510@qq.com>
Date: Sat, 25 May 2024 16:22:34 +0800
Subject: [PATCH] 111

---
 CreateModel.bat                               |   4 +-
 HJGL/.vs/HJGL/v17/.suo                        | Bin 1068032 -> 1061888 bytes
 HJGL/FineUIPro.Web/Web.config                 |   2 +-
 .../TestPackageManage/ImportError.aspx        |   5 +-
 .../TestPackageManage/ImportError.aspx.cs     |   2 +-
 .../TrustManage/TrustBatchIn.aspx             | 116 ++--
 .../TrustManage/TrustBatchIn.aspx.cs          |  96 +--
 .../TrustManage/TrustBatchIn.aspx.designer.cs |  18 -
 .../TrustManage/TrustBatchManage.aspx         |   2 +-
 HJGL/Model/Model.cs                           | 565 +++---------------
 10 files changed, 152 insertions(+), 658 deletions(-)

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 d71bcc4645c1fc5362d50e5638b54fb521710d92..e210b64a820333d6319fc67a4e27ee28aa904632 100644
GIT binary patch
delta 14148
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

delta 18028
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
J!*5&%{1>r8c4+_r

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