From 494f749a11f3caf1103a9713396c65e4ba66816f Mon Sep 17 00:00:00 2001 From: gaofei <181547018@qq.com> Date: Tue, 21 Feb 2023 14:27:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=9D=90=E6=96=99=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=BF=85=E5=A1=AB=E9=A1=B9=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CQMS/Material/MaterialIn.aspx.cs | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/SGGL/FineUIPro.Web/CQMS/Material/MaterialIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/MaterialIn.aspx.cs index c234f29a..7d8dca86 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/MaterialIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/MaterialIn.aspx.cs @@ -192,18 +192,18 @@ namespace FineUIPro.Web.CQMS.Material } string row2 = pds.Rows[i][2].ToString(); - if (string.IsNullOrEmpty(row2)) - { - result += (i + 2).ToString() + "," + "主项名称" + "," + "此项为必填项！" + "|"; - } - else - { + //if (string.IsNullOrEmpty(row2)) + //{ + // result += (i + 2).ToString() + "," + "主项名称" + "," + "此项为必填项！" + "|"; + //} + //else + //{ var mainItem = mainItems.FirstOrDefault(x => x.MainItemName == row2); if (mainItem == null) { result += (i + 2).ToString() + "," + "主项名称" + "," + "[" + row2 + "]不存在！" + "|"; } - } + //} string row3 = pds.Rows[i][3].ToString(); if (string.IsNullOrEmpty(row3)) @@ -246,10 +246,10 @@ namespace FineUIPro.Web.CQMS.Material result += (i + 2).ToString() + "," + "到货日期" + "," + "[" + row10 + "]格式错误！" + "|"; } } - else - { - result += (i + 2).ToString() + "," + "到货日期" + "," + "此项为必填项！" + "|"; - } + //else + //{ + // result += (i + 2).ToString() + "," + "到货日期" + "," + "此项为必填项！" + "|"; + //} } } if (!string.IsNullOrEmpty(result))