2022-10-11 焊接修改及接口新增

SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx

@@ -51,7 +51,7 @@
             <Rows>
                 <f:FormRow>
                     <Items>
-                          <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="历史记录" IsFluid="true"
+                          <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="历史记录" IsFluid="true" ForceFit="true"
                                     EnableCollapse="false" runat="server" BoxFlex="1" DataKeyNames="DesignBasisDataImportId"
                                     AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DesignBasisDataImportId"
                                     AllowSorting="true" SortField="CreateDate" SortDirection="ASC"   EnableMultiSelect="false"

SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs

@@ -195,7 +195,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                         }
                         else
                         {
-                            errorInfos += (i + 2) + "Line, [管线号] 不存在</br>";
+                            errorInfos += (i + 2) + "Line,"+ dv[i]["管线号"].ToString() + " [管线号] 不存在</br>";
                         }
 
                     }
@@ -240,7 +240,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                         }
                         else
                         {
-                            errorInfos += (i + 2) + "Line, [材料编码] 不存在</br>";
+                            errorInfos += (i + 2) + "Line," + dv[i]["材料编码"].ToString() + " [材料编码] 不存在</br>";
                         }
 
                     }
@@ -367,6 +367,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             string fileName = rootPath + initPath + this.hdFileName.Text;
             //读取Excel
             DataSet ds = NPOIHelper.ExcelToDataSet(fileName, out errorInfos, true);
+
             //验证Excel读取是否有误
             if (!string.IsNullOrEmpty(errorInfos))
             {