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

注塑挤出任务单下发列表页添加设备信息

Browse Source
This commit is contained in:
周科达
2023-07-31 11:59:10 +08:00
parent 52f709c41a
commit 05dcc210bf
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskIssueListOutput.cs
View File

@@ -6,6 +6,7 @@ namespace Tnb.ProductionMgr.Entities.Dto
public string mo_task_code { get; set; } public string mo_task_code { get; set; }
public string material_id { get; set; } public string material_id { get; set; }
public string mold_id { get; set; } public string mold_id { get; set; }
public string eqp_id { get; set; }
public string mo_task_status { get; set; } public string mo_task_status { get; set; }
public int? plan_qty { get; set; } public int? plan_qty { get; set; }
public int? scheduled_qty { get; set; } public int? scheduled_qty { get; set; }

7
ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs
View File

@@ -114,21 +114,22 @@ namespace Tnb.ProductionMgr
.LeftJoin<DictionaryDataEntity>((a, b, c, d) => c.Id == d.DictionaryTypeId && a.mo_task_status == d.EnCode) .LeftJoin<DictionaryDataEntity>((a, b, c, d) => c.Id == d.DictionaryTypeId && a.mo_task_status == d.EnCode)
.LeftJoin<ToolMolds>((a,b,c,d,e)=>a.mold_id==e.id) .LeftJoin<ToolMolds>((a,b,c,d,e)=>a.mold_id==e.id)
.LeftJoin<PrdMo>((a,b,c,d,e,f)=>a.mo_id==f.id) .LeftJoin<PrdMo>((a,b,c,d,e,f)=>a.mo_id==f.id)
.LeftJoin<EqpEquipment>((a,b,c,d,e,f,g)=>g.id==a.eqp_id)
.WhereIF(!string.IsNullOrEmpty(moTaskCode), (a, b, c, d) => a.mo_task_code.Contains(moTaskCode)) .WhereIF(!string.IsNullOrEmpty(moTaskCode), (a, b, c, d) => a.mo_task_code.Contains(moTaskCode))
.WhereIF(!string.IsNullOrEmpty(moTaskStatus), (a, b, c, d) => a.mo_task_status == moTaskStatus) .WhereIF(!string.IsNullOrEmpty(moTaskStatus), (a, b, c, d) => a.mo_task_status == moTaskStatus)
.Where((a,b,c,d,e,f)=>a.schedule_type==1) .Where((a,b,c,d,e,f)=>a.schedule_type==1)
.OrderByDescending(a=>a.create_time) .Select((a, b, c, d,e,f,g) => new PrdMoTaskIssueListOutput
.Select((a, b, c, d,e,f) => new PrdMoTaskIssueListOutput
{ {
id = a.id, id = a.id,
mo_task_code = a.mo_task_code, mo_task_code = a.mo_task_code,
material_id = b.code+"/"+b.name, material_id = b.code+"/"+b.name,
mold_id = e.mold_code+"/"+e.mold_name, mold_id = e.mold_code+"/"+e.mold_name,
eqp_id = g.code+"/"+g.name,
mo_task_status = d.FullName, mo_task_status = d.FullName,
plan_qty = f.plan_qty, plan_qty = f.plan_qty,
scheduled_qty = a.scheduled_qty, scheduled_qty = a.scheduled_qty,
create_time = a.create_time==null ? "" :a.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss"), create_time = a.create_time==null ? "" :a.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
}).ToPagedListAsync(input.currentPage, input.pageSize); }).OrderByDescending(a=>a.create_time).ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<PrdMoTaskIssueListOutput>.SqlSugarPageResult(result); return PageResult<PrdMoTaskIssueListOutput>.SqlSugarPageResult(result);
} }
} }