2023-06-12

This commit is contained in:
2023-06-12 15:02:30 +08:00
parent b9315dd056
commit 624a9d9dc3
4 changed files with 114 additions and 39 deletions
@@ -201,14 +201,14 @@ namespace FineUIPro.Web.HJGL.BaseInfo
{
result += "第" + (i + 2).ToString() + "行," + "介质代号" + "," + "此项为必填项!" + "|";
}
else
{
var code = q.FirstOrDefault(x => x.MediumCode == col0);
if (code != null)
{
result += "第" + (i + 2).ToString() + "行," + "此等级代号已存在" + "|";
}
}
//else
//{
// var code = q.FirstOrDefault(x => x.MediumCode == col0);
// if (code != null)
// {
// result += "第" + (i + 2).ToString() + "行," + "此等级代号已存在" + "|";
// }
//}
string col1 = pds.Rows[i][1].ToString();
if (string.IsNullOrEmpty(col1))
{
@@ -216,12 +216,13 @@ namespace FineUIPro.Web.HJGL.BaseInfo
}
else
{
var code = q.FirstOrDefault(x => x.MediumName == col1);
var code = q.FirstOrDefault(x =>x.MediumCode== col0&& x.MediumName == col1);
if (code != null)
{
result += "第" + (i + 2).ToString() + "行," + "此介质名称已存在" + "|";
result += "第" + (i + 2).ToString() + "行," + "此介质代号、名称已存在" + "|";
}
}
string col2 = pds.Rows[i][2].ToString();
if (string.IsNullOrEmpty(col2))
{