feat(hjgl): 完善焊接任务与质量管理流程
This commit is contained in:
@@ -91,8 +91,6 @@ namespace BLL
|
||||
{
|
||||
var data = (from f in db.HJGL_PreWeldFitupCheck
|
||||
join w in db.HJGL_WeldJoint on f.WeldJointId equals w.WeldJointId
|
||||
join g in db.Base_GrooveType on f.GrooveTypeId equals g.GrooveTypeId into grooveTypes
|
||||
from g in grooveTypes.DefaultIfEmpty()
|
||||
join p in db.Person_Persons on f.CheckPerson equals p.PersonId into persons
|
||||
from p in persons.DefaultIfEmpty()
|
||||
where f.WeldJointId == weldJointId
|
||||
@@ -104,17 +102,8 @@ namespace BLL
|
||||
WeldJointId = f.WeldJointId,
|
||||
PipelineCode = w.PipelineCode,
|
||||
WeldJointCode = w.WeldJointCode,
|
||||
GrooveTypeId = f.GrooveTypeId,
|
||||
GrooveTypeCode = g == null ? string.Empty : g.GrooveTypeCode,
|
||||
GrooveTypeName = g == null ? string.Empty : g.GrooveTypeName,
|
||||
GrooveProcessType = f.GrooveProcessType,
|
||||
GrooveAngle = f.GrooveAngle,
|
||||
FitupGap = f.FitupGap,
|
||||
Misalignment = f.Misalignment,
|
||||
WeldReinforcement = f.WeldReinforcement,
|
||||
WeldHeight = f.WeldHeight,
|
||||
WeldWidth = f.WeldWidth,
|
||||
SurfaceDefect = f.SurfaceDefect,
|
||||
CheckPerson = f.CheckPerson,
|
||||
CheckPersonName = p == null ? string.Empty : p.PersonName,
|
||||
CheckTime = f.CheckTime,
|
||||
@@ -135,7 +124,7 @@ namespace BLL
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 按材料编码获取防腐检查记录
|
||||
/// 按入库条码获取材料信息及防腐检查记录
|
||||
/// </summary>
|
||||
public static List<Model.AntiCorrosionCheckRecordItem> GetAntiCorrosionChecksByMaterialCode(string barCode, string projectId)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user