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))