From fe520d1201e59f2decea5d6ad3a027ca6677a598 Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Mon, 21 Nov 2022 10:17:42 +0800
Subject: [PATCH] =?UTF-8?q?2022-11-21=20001=20=20=E7=84=8A=E6=8E=A5?=
=?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=85=A5=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 4 ++--
.../HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
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);