11
This commit is contained in:
@@ -354,7 +354,8 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
|
||||
newDataInTemp.Value35 = ds.Tables[0].Rows[i][34].ToString().Trim();
|
||||
newDataInTemp.Value36 = ds.Tables[0].Rows[i][35].ToString().Trim();
|
||||
newDataInTemp.Value37 = ds.Tables[0].Rows[i][36].ToString().Trim();
|
||||
|
||||
newDataInTemp.Value38 = ds.Tables[0].Rows[i][37].ToString().Trim();
|
||||
|
||||
BLL.DataInTempService.AddDataInTemp(newDataInTemp);
|
||||
}
|
||||
}
|
||||
@@ -1542,10 +1543,24 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
|
||||
}
|
||||
}
|
||||
|
||||
//if (!string.IsNullOrEmpty(tempData.Value22) && !string.IsNullOrEmpty(tempData.Value23))
|
||||
//{
|
||||
// weldJoint.Specification = "Φ" + tempData.Value22 + "*" + tempData.Value23;
|
||||
//}
|
||||
if (!string.IsNullOrEmpty(tempData.Value38))
|
||||
{
|
||||
if (tempData.Value38 == "是")
|
||||
{
|
||||
weldJoint.IsPMI = true;
|
||||
}
|
||||
else if (tempData.Value38 == "否")
|
||||
{
|
||||
weldJoint.IsPMI = false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (jot != null && jot.IsPMI != null)
|
||||
{
|
||||
weldJoint.IsPMI = jot.IsPMI;
|
||||
}
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty(errInfo)) // 所有信息正确的话 这插入管线焊口
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user