From 1bd3a4ed2cf32fc3986ac0b828c522250d1f4bfe Mon Sep 17 00:00:00 2001
From: jackchenyang <874821510@qq.com>
Date: Sat, 25 May 2024 16:25:27 +0800
Subject: [PATCH] 11221

---
 HJGL/.vs/HJGL/v17/.suo                        | Bin 1061888 -> 1062912 bytes
 .../TestPackageManage/ImportError.aspx.cs     |   2 +-
 .../TrustManage/TrustBatchIn.aspx             | 116 ++--
 .../TrustManage/TrustBatchIn.aspx.cs          |  98 +--
 .../TrustManage/TrustBatchIn.aspx.designer.cs |  18 +
 .../TrustManage/TrustBatchManage.aspx         |   2 +-
 HJGL/Model/Model.cs                           | 565 +++++++++++++++---
 7 files changed, 652 insertions(+), 149 deletions(-)

diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo
index e210b64a820333d6319fc67a4e27ee28aa904632..dd236ad738f0326742ff1ddd26007f2c1ed3923a 100644
GIT binary patch
delta 14916
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

delta 11161
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

diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx.cs
index 7e4f63d..21d6156 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.TestPackageNo).ToList();
+            var list = Funs.DB.PTP_TestPackage_ImportErrorLog.Where(t => t.BatchNo == batchNo).OrderBy(t => t.RowId).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 daa41cd..8815dce 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx
@@ -8,8 +8,7 @@
     <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;
         }
@@ -17,50 +16,79 @@
 </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>
-    </f:Form>
+                    </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>
     </form>
 </body>
 </html>
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.cs
index f11f1dc..ada1ff7 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.cs
@@ -88,15 +88,19 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
 
             if (ds.Tables.Count > 0)
             {
-                string result = string.Empty;
-                List<Model.Batch_BatchTrust> trustList= new List<Model.Batch_BatchTrust>();
+
+                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();
@@ -107,18 +111,33 @@ 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 += "第" + (i + 2).ToString() + "行," + "委托单号" + "," + "此项为必填项！" + "|";
+                        result += "委托单号此项为必填项！" + "|";
                     }
                     else
                     {
                         var oldTrust = Funs.DB.Batch_BatchTrust.FirstOrDefault(x => x.TrustBatchCode == col0);
                         if (oldTrust != null)
                         {
-                            result += "第" + (i + 2).ToString() + "行," + "委托单号" + "," + "[" + col0 + "]已存在！" + "|";
+                            result += "委托单号 [" + col0 + "]已存在！" + "|";
                         }
                         else
                         {
@@ -132,7 +151,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         Model.Project_Installation ins = installation.FirstOrDefault(x => x.InstallationCode == col1);
                         if (ins == null)
                         {
-                            result += "第" + (i + 2).ToString() + "行," + "装置编号" + "," + "[" + col1 + "]不存在！" + "|";
+                            result += "装置编号 [" + col1 + "]不存在！" + "|";
                         }
                         else
                         {
@@ -142,7 +161,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                     }
                     else
                     {
-                        result += "第" + (i + 2).ToString() + "行," + "装置编号" + "," + "此项为必填项！" + "|";
+                        result += "装置编号此项为必填项！" + "|";
                     }
 
                     string workAreaId = string.Empty;
@@ -151,7 +170,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         Model.Project_WorkArea workArea = area.FirstOrDefault(x => x.WorkAreaCode == col2 && x.InstallationId == installationId);
                         if (workArea == null)
                         {
-                            result += "第" + (i + 2).ToString() + "行," + "区域编号" + "," + "[" + col2 + "]不存在！" + "|";
+                            result += "区域编号 [" + col2 + "]不存在！" + "|";
                         }
                         else
                         {
@@ -161,7 +180,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                     }
                     else
                     {
-                        result += "第" + (i + 2).ToString() + "行," + "区域编号" + "," + "此项为必填项！" + "|";
+                        result += "区域编号此项为必填项！" + "|";
                     }
 
                     string pipelineId = string.Empty;
@@ -170,7 +189,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         var pipe = pipeList.FirstOrDefault(x => x.PipelineCode == col3 && x.WorkAreaId == workAreaId);
                         if (pipe == null)
                         {
-                            result += "第" + (i + 2).ToString() + "行," + "该区域管线号" + "," + "[" + col3 + "]不存在！" + "|";
+                            result += "该区域管线号 [" + col3 + "]不存在！" + "|";
                         }
                         else
                         {
@@ -180,7 +199,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                     }
                     else
                     {
-                        result += "第" + (i + 2).ToString() + "行," + "管线号" + "," + "此项为必填项！" + "|";
+                        result += "管线号此项为必填项！" + "|";
                     }
 
                     string weldJointId = string.Empty;
@@ -189,23 +208,23 @@ 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 += "第" + (i + 2).ToString() + "行," + "焊口号" + "," + "[" + col4 + "]不存在！" + "|";
+                            result += "焊口号 [" + col4 + "]不存在！" + "|";
                         }
 
                         else if (weldJoint.Count() == 1)
                         {
                             weldJointId = weldJoint.First().WeldJointId;
-                            t.WeldingMethodId=weldJoint.First().WeldingMethodId;
+                            t.WeldingMethodId = weldJoint.First().WeldingMethodId;
                             t.GrooveTypeId = weldJoint.First().GrooveTypeId;
                         }
                         else
                         {
-                            result += "第" + (i + 2).ToString() + "行," + "焊口号" + "," + "[" + col4 + "]重复！" + "|";
+                            result += "焊口号 [" + col4 + "]重复！" + "|";
                         }
                     }
                     else
                     {
-                        result += "第" + (i + 2).ToString() + "行," + "焊口号" + "," + "此项为必填项！" + "|";
+                        result += "焊口号此项为必填项！" + "|";
                     }
 
                     string ndeId = string.Empty;
@@ -214,7 +233,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         var nde = Funs.DB.Base_DetectionType.FirstOrDefault(x => x.DetectionTypeCode == col5);
                         if (nde == null)
                         {
-                            result += "第" + (i + 2).ToString() + "行," + "探伤类型" + "," + "[" + col5 + "]错误！" + "|";
+                            result += "探伤类型[" + col5 + "]错误！" + "|";
                         }
 
                         else
@@ -225,19 +244,19 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                     }
                     else
                     {
-                        result += "第" + (i + 2).ToString() + "行," + "探伤类型" + "," + "此项为必填项！" + "|";
+                        result += "探伤类型此项为必填项！" + "|";
                     }
 
                     var pointBatchItem = trustIn.FirstOrDefault(x => x.InstallationId == installationId && x.WorkAreaId == workAreaId && x.PipelineId == pipelineId && x.WeldJointId == weldJointId && x.DetectionTypeId == ndeId);
                     if (pointBatchItem == null)
                     {
-                        result += "第" + (i + 2).ToString() + "行," + "检验批中不存在对应焊口信息"  + "|";
+                        result += "检验批中不存在对应焊口信息" + "|";
                     }
                     else
                     {
                         if (pointBatchItem.TrustBatchItemId != null)
                         {
-                            result += "第" + (i + 2).ToString() + "行," + "焊口已委托" + "|";
+                            result += "焊口已委托" + "|";
                         }
                         else
                         {
@@ -254,12 +273,12 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         }
                         catch (Exception)
                         {
-                            result += "第" + (i + 2).ToString() + "行," + "委托日期" + "," + "[" + col6 + "]错误！" + "|";
+                            result += "委托日期 [" + col6 + "]错误！" + "|";
                         }
                     }
                     else
                     {
-                        result += "第" + (i + 2).ToString() + "行," + "委托日期" + "," + "此项为必填项！" + "|";
+                        result += "委托日期此项为必填项！" + "|";
                     }
 
                     if (!string.IsNullOrEmpty(col7))
@@ -267,7 +286,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         Model.Base_Unit unit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitCode == col7);
                         if (unit == null)
                         {
-                            result += "第" + (i + 2).ToString() + "行," + "检测单位编号" + "," + "[" + col7 + "]错误！" + "|";
+                            result += "检测单位编号[" + col7 + "]错误！" + "|";
                         }
                         else
                         {
@@ -276,31 +295,35 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                     }
                     else
                     {
-                        result += "第" + (i + 2).ToString() + "行," + "检测单位" + "," + "此项为必填项！" + "|";
+                        result += "检测单位此项为必填项！" + "|";
                     }
 
                     if (!string.IsNullOrEmpty(col8))
                     {
-                        if (col8!= "打磨" && col8 != "机加工" && col8 != "喷砂" && col8 != "漆面")
+                        if (col8 != "打磨" && col8 != "机加工" && col8 != "喷砂" && col8 != "漆面")
                         {
-                            result += "第" + (i + 2).ToString() + "行," + "表面检测需录入：打磨、机加工、喷砂、漆面" + "|";
+                            result += "表面检测需录入：打磨、机加工、喷砂、漆面" + "|";
                         }
                     }
                     if (!string.IsNullOrEmpty(col9))
                     {
                         if (col9 != "焊后" && col9 != "打磨后" && col9 != "热处理后" && col9 != "坡口准备" && col9 != "清根后" && col9 != "压力试验后" && col9 != "其他")
                         {
-                            result += "第" + (i + 2).ToString() + "行," + "检测时机需录入：焊后、打磨后、热处理后、坡口准备、清根后、压力试验后、其他" + "|";
+                            result += "检测时机需录入：焊后、打磨后、热处理后、坡口准备、清根后、压力试验后、其他" + "|";
                         }
                     }
 
+                    log.Remark = result;
+                    logListData.Add(log);
                     trustList.Add(t);
                 }
 
-                var trustCodeList=trustList.Select(p=>p.TrustBatchCode).Distinct();
+                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 + "装置不一至" + "|";
@@ -329,17 +352,18 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                     {
                         result += "委托单" + trustCode + "委托日期不一至" + "|";
                     }
+                    if (logInfo != null)
+                    {
+                        logInfo.Remark += result;
+                    }
                 }
 
-                if (!string.IsNullOrEmpty(result))
+                if (logListData.Where(t => t.Remark != "").Any())
                 {
-                    if (result.Contains("|"))
-                    {
-                        result = result.Substring(0, result.LastIndexOf("|"));
-                    }
-                    errorInfos = result;
-
-                    lbResult.Text = result;
+                    Funs.DB.TrustBatchImportErrorLog.InsertAllOnSubmit(logListData);
+                    Funs.DB.SubmitChanges();
+                    this.Grid1.Hidden = false;
+                    this.BindGrid1(BatchNo);
                 }
                 else
                 {
@@ -350,6 +374,12 @@ 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
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.designer.cs
index e92d605..a33067c 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.designer.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.designer.cs
@@ -112,5 +112,23 @@ 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 dd1c81a..4d07f97 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="1024px" Height="640px">
+     CloseAction="HidePostBack" Width="1200px" 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 bd40617..8f2cc39 100644
--- a/HJGL/Model/Model.cs
+++ b/HJGL/Model/Model.cs
@@ -263,6 +263,9 @@ 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);
@@ -928,6 +931,14 @@ 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
@@ -22499,12 +22510,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);
@@ -22523,12 +22534,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()
@@ -22596,7 +22607,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
 		public string ProjectId
 		{
 			get
@@ -22676,26 +22687,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();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(255)")]
 		public string Remark
 		{
@@ -22736,6 +22727,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();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -22775,10 +22786,10 @@ namespace Model
 		
 		private int _Status;
 		
-		private System.Nullable<System.DateTime> _CheckTime;
-		
 		private string _ReportNo;
 		
+		private System.Nullable<System.DateTime> _CheckTime;
+		
 		private System.Nullable<System.DateTime> _ReportTime;
 		
     #region 可扩展性方法定义
@@ -22797,10 +22808,10 @@ namespace Model
     partial void OnAcceptanceChanged();
     partial void OnStatusChanging(int value);
     partial void OnStatusChanged();
-    partial void OnCheckTimeChanging(System.Nullable<System.DateTime> value);
-    partial void OnCheckTimeChanged();
     partial void OnReportNoChanging(string value);
     partial void OnReportNoChanged();
+    partial void OnCheckTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnCheckTimeChanged();
     partial void OnReportTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnReportTimeChanged();
     #endregion
@@ -22910,7 +22921,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="Int NOT NULL")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="status", Storage="_Status", DbType="Int NOT NULL")]
 		public int Status
 		{
 			get
@@ -22930,26 +22941,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")]
-		public System.Nullable<System.DateTime> CheckTime
-		{
-			get
-			{
-				return this._CheckTime;
-			}
-			set
-			{
-				if ((this._CheckTime != value))
-				{
-					this.OnCheckTimeChanging(value);
-					this.SendPropertyChanging();
-					this._CheckTime = value;
-					this.SendPropertyChanged("CheckTime");
-					this.OnCheckTimeChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportNo", Storage="_ReportNo", DbType="NVarChar(50)")]
 		public string ReportNo
 		{
@@ -22970,6 +22961,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CheckTime
+		{
+			get
+			{
+				return this._CheckTime;
+			}
+			set
+			{
+				if ((this._CheckTime != value))
+				{
+					this.OnCheckTimeChanging(value);
+					this.SendPropertyChanging();
+					this._CheckTime = value;
+					this.SendPropertyChanged("CheckTime");
+					this.OnCheckTimeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportTime", Storage="_ReportTime", DbType="DateTime")]
 		public System.Nullable<System.DateTime> ReportTime
 		{
@@ -32261,6 +32272,404 @@ 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
 	{
@@ -39146,6 +39555,8 @@ namespace Model
 		
 		private string _ProjectId;
 		
+		private System.Nullable<bool> _IsPMI;
+		
 		private string _PipelineCode;
 		
 		private string _PipelineId;
@@ -39276,6 +39687,22 @@ 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
 		{
@@ -41284,8 +41711,6 @@ namespace Model
 		
 		private string _PipingClassCode;
 		
-		private string _PIPClassCode;
-		
 		private string _WeldingDate;
 		
 		private System.Nullable<bool> _IsCancel;
@@ -41300,6 +41725,8 @@ namespace Model
 		
 		private string _DetectionType;
 		
+		private string _PIPClassCode;
+		
 		private string _PageNum;
 		
 		public View_Pipeline_WeldJoint()
@@ -42394,22 +42821,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="_WeldingDate", DbType="VarChar(100)")]
 		public string WeldingDate
 		{
@@ -42522,6 +42933,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="_PageNum", DbType="NVarChar(10)")]
 		public string PageNum
 		{
@@ -47085,7 +47512,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WelderIds", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WelderIds", DbType="VarChar(1000)")]
 		public string WelderIds
 		{
 			get