2022-12-23
This commit is contained in:
parent
aca0c3192b
commit
b059a344d1
Binary file not shown.
|
|
@ -1029,7 +1029,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||||
pipeline.WeldJointCode = col19;
|
pipeline.WeldJointCode = col19;
|
||||||
}
|
}
|
||||||
|
|
||||||
string col20 = pds[i].U.ToString();
|
string col20 = "";
|
||||||
|
if (pds[i].U!=null)
|
||||||
|
{
|
||||||
|
col20 = pds[i].U.ToString();
|
||||||
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(col20))
|
if (!string.IsNullOrEmpty(col20))
|
||||||
{
|
{
|
||||||
var material = getMaterial.FirstOrDefault(x => x.MaterialCode == col20);
|
var material = getMaterial.FirstOrDefault(x => x.MaterialCode == col20);
|
||||||
|
|
@ -1049,7 +1054,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||||
result.Add("第" + (i + 1).ToString() + "行," + "材质1" + "," + "此项为必填项!" + "|");
|
result.Add("第" + (i + 1).ToString() + "行," + "材质1" + "," + "此项为必填项!" + "|");
|
||||||
}
|
}
|
||||||
|
|
||||||
string col21 = pds[i].V.ToString();
|
string col21 = "";
|
||||||
|
if (pds[i].V!=null)
|
||||||
|
{
|
||||||
|
col21 = pds[i].V.ToString();
|
||||||
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(col21))
|
if (!string.IsNullOrEmpty(col21))
|
||||||
{
|
{
|
||||||
var material = getMaterial.FirstOrDefault(x => x.MaterialCode == col21);
|
var material = getMaterial.FirstOrDefault(x => x.MaterialCode == col21);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue