lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

This commit is contained in:
李鹏飞 2023-02-21 16:36:27 +08:00
parent c1960a5ff5 2589ff97b4
commit c00bf3e9a8
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
SGGL/FineUIPro.Web/CQMS/Material/MaterialIn.aspx.cs
View File

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