From b059a344d138dd2e3d11aa6e8ef37e8975f1c485 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Fri, 23 Dec 2022 09:03:32 +0800 Subject: [PATCH] 2022-12-23 --- .vs/SGGL_SeDin/v17/.wsuo | Bin 23040 -> 26112 bytes .../WeldingManage/PipelineListPDMSIn.aspx.cs | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 32a1be25f69c6b2bce7beafffb0b10119ea7b6e6..1e4add156610204b60ffb5af4db0cca6ac063c65 100644 GIT binary patch literal 26112 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 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);