This commit is contained in:
parent
d6bedb9f0f
commit
e212b9a790
|
|
@ -314,7 +314,22 @@ namespace FineUIPro.Web.HJGL.DataIn
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "材质":
|
case "材质":
|
||||||
isoInfo.STE_ID = steels.Where(x => x.STE_Code == row[dataColumn.ColumnName].ToString()).Select(x => x.STE_ID).FirstOrDefault();
|
|
||||||
|
var steel = steels.FirstOrDefault(x => x.STE_Code == row[dataColumn.ColumnName].ToString());
|
||||||
|
if (steel != null)
|
||||||
|
{
|
||||||
|
isoInfo.STE_ID = steel.STE_ID;
|
||||||
|
if(steel.STE_SteelType == "FeⅣ")
|
||||||
|
{
|
||||||
|
isoInfo.IsHotType = "1";
|
||||||
|
|
||||||
|
}
|
||||||
|
else if (steel.STE_SteelType == "FeⅠ" || steel.STE_SteelType == "FeⅡ" || steel.STE_SteelType == "FeⅢ" )
|
||||||
|
{
|
||||||
|
isoInfo.IsHotType = "2";
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case "材质标准":
|
case "材质标准":
|
||||||
isoInfo.MaterialStandardId = materialStandards.Where(x => x.MaterialStandardName == row[dataColumn.ColumnName].ToString()||x.MaterialStandardCode == row[dataColumn.ColumnName].ToString()).Select(x => x.MaterialStandardId).FirstOrDefault();
|
isoInfo.MaterialStandardId = materialStandards.Where(x => x.MaterialStandardName == row[dataColumn.ColumnName].ToString()||x.MaterialStandardCode == row[dataColumn.ColumnName].ToString()).Select(x => x.MaterialStandardId).FirstOrDefault();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue