diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo
index 32a1be25..1e4add15 100644
Binary files a/.vs/SGGL_SeDin/v17/.wsuo and b/.vs/SGGL_SeDin/v17/.wsuo differ
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
index e7d3ed27..97621059 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
@@ -1029,7 +1029,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                         pipeline.WeldJointCode = col19;
                     }
 
-                    string col20 = pds[i].U.ToString();
+                    string col20 = "";
+                    if (pds[i].U!=null)
+                    {
+                        col20 = pds[i].U.ToString();
+                    }
+                   
                     if (!string.IsNullOrEmpty(col20))
                     {
                         var material = getMaterial.FirstOrDefault(x => x.MaterialCode == col20);
@@ -1049,7 +1054,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                         result.Add("第" + (i + 1).ToString() + "行," + "材质1" + "," + "此项为必填项！" + "|");
                     }
 
-                    string col21 = pds[i].V.ToString();
+                    string col21 = "";
+                    if (pds[i].V!=null)
+                    {
+                        col21 = pds[i].V.ToString();
+                    }
+                   
                     if (!string.IsNullOrEmpty(col21))
                     {
                         var material = getMaterial.FirstOrDefault(x => x.MaterialCode == col21);