焊口导入增加焊点坐标
This commit is contained in:
@@ -730,6 +730,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
}
|
||||
}
|
||||
|
||||
// 读取焊点坐标(AE列)
|
||||
string col29 = Convert.ToString(pds[i].AE);
|
||||
if (!string.IsNullOrEmpty(col29))
|
||||
{
|
||||
pipeline.WeldJointPoint = col29;
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(pipeline.PipelineCode) && !string.IsNullOrEmpty(pipeline.WeldJointCode))
|
||||
{
|
||||
pipeline.ProjectId = this.CurrUser.LoginProjectId;
|
||||
@@ -1039,6 +1046,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
JointAttribute = x.JointAttribute,
|
||||
ProjectId = this.CurrUser.LoginProjectId,
|
||||
IsHotProess = x.IsHotProess,
|
||||
WeldJointPoint = x.WeldJointPoint,
|
||||
}).DistinctBy(temp => new
|
||||
{
|
||||
temp.WeldJointCode,
|
||||
@@ -1054,7 +1062,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
temp.DetectionTypeId,
|
||||
temp.JointAttribute,
|
||||
temp.ProjectId,
|
||||
temp.IsHotProess
|
||||
temp.IsHotProess,
|
||||
temp.WeldJointPoint
|
||||
}).ToList();
|
||||
|
||||
var pipelineCodes = weldJoints.Select(x => x.PipelineCode).Distinct().ToList();
|
||||
@@ -1076,6 +1085,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
weldJoint.JointAttribute = weldJoints[i].JointAttribute;
|
||||
weldJoint.ProjectId = weldJoints[i].ProjectId;
|
||||
weldJoint.IsHotProess = weldJoints[i].IsHotProess;
|
||||
weldJoint.WeldJointPoint = weldJoints[i].WeldJointPoint;
|
||||
|
||||
var isExistJot = allWeldJoints.FirstOrDefault(x => x.PipelineId == weldJoint.PipelineId && x.WeldJointCode == weldJoint.WeldJointCode);
|
||||
if (isExistJot != null) // 更新焊口
|
||||
|
||||
Reference in New Issue
Block a user