diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index e9884f10..4f55694d 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -105,8 +105,8 @@ False - - ..\packages\MiniExcel.1.26.5\lib\net45\MiniExcel.dll + + ..\packages\MiniExcel.1.29.0\lib\net45\MiniExcel.dll ..\packages\Newtonsoft.Json.12.0.1\lib\net40\Newtonsoft.Json.dll diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs index e999f736..6706249e 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs @@ -1006,7 +1006,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage pipeline.WeldJointCode = col19; } - string col20 = pds[i].U; + string col20 = pds[i].U.ToString(); if (!string.IsNullOrEmpty(col20)) { var material = getMaterial.FirstOrDefault(x => x.MaterialCode == col20); @@ -1025,7 +1025,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage result += "第" + (i + 1).ToString() + "行," + "材质1" + "," + "此项为必填项!" + "|"; } - string col21 = pds[i].V; + string col21 = pds[i].V.ToString(); if (!string.IsNullOrEmpty(col21)) { var material = getMaterial.FirstOrDefault(x => x.MaterialCode == col21);