wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
周科达
2023-06-28 14:09:51 +08:00
parent 3394740eb7
commit 35b7d3ea97
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PackSechelToBeIssueListOutput.cs
View File

@@ -76,6 +76,11 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// 预计结束时间 /// 预计结束时间
/// </summary> /// </summary>
public DateTime? estimated_end_date { get; set; } public DateTime? estimated_end_date { get; set; }
/// <summary>
/// 工序名称
/// </summary>
public string? process_name { get; set; }
} }
} }

4
ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
View File

@@ -401,8 +401,9 @@ namespace Tnb.ProductionMgr
.LeftJoin<BasMaterial>((a, b) => a.material_id == b.id) .LeftJoin<BasMaterial>((a, b) => a.material_id == b.id)
.LeftJoin<OrganizeEntity>((a, b, c) => a.workline_id == c.Id) .LeftJoin<OrganizeEntity>((a, b, c) => a.workline_id == c.Id)
.LeftJoin<PrdMo>((a, b, c, d) => a.mo_id == d.id) .LeftJoin<PrdMo>((a, b, c, d) => a.mo_id == d.id)
.LeftJoin<BasProcess>((a,b,c,d,e)=>a.process_id==e.id)
.Where((a, b, c, d) => a.parent_id == mo_task_id) .Where((a, b, c, d) => a.parent_id == mo_task_id)
.Select((a, b, c, d) => new PackSechelToBeIssueListOutput .Select((a, b, c, d,e) => new PackSechelToBeIssueListOutput
{ {
mo_task_id = a.id, mo_task_id = a.id,
mo_task_code = a.mo_task_code, mo_task_code = a.mo_task_code,
@@ -416,6 +417,7 @@ namespace Tnb.ProductionMgr
process_task_qty = a.process_task_qty, process_task_qty = a.process_task_qty,
estimated_start_date = a.estimated_start_date, estimated_start_date = a.estimated_start_date,
estimated_end_date = a.estimated_end_date, estimated_end_date = a.estimated_end_date,
process_name = e.process_name,
bom_version = SqlFunc.Subqueryable<BasMbom>().Where(it => it.material_id == a.material_id).Select(it => it.version) bom_version = SqlFunc.Subqueryable<BasMbom>().Where(it => it.material_id == a.material_id).Select(it => it.version)
}) })
.Mapper(it => it.mo_task_status = dic.ContainsKey(it.mo_task_status) ? dic[it.mo_task_status].ToString()! : "") .Mapper(it => it.mo_task_status = dic.ContainsKey(it.mo_task_status) ? dic[it.mo_task_status].ToString()! : "")