diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PADPackageTaskPageOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PADPackageTaskPageOutput.cs index 93b18d85..622015f1 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PADPackageTaskPageOutput.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PADPackageTaskPageOutput.cs @@ -91,5 +91,6 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage public string mold_id { get; set; } public string mold_code { get; set; } public string mold_name { get; set; } + public DateTime? create_time { get; set; } } } \ No newline at end of file diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs index 6ed5f27f..6e20deda 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs @@ -341,9 +341,72 @@ namespace Tnb.ProductionMgr return PageResult.SqlSugarPageResult(result); } + + /// + /// pda端根据工位获取任务单列表 + /// + /// + [HttpPost] + public async Task GetPadPrdMoTaskList(PrdPackReportQueryInput input) + { + if (string.IsNullOrEmpty(input.stationId)) + { + return new + { + pagination = new PageResult(), + list = Array.Empty() + }; + } + + var result = await _db.Queryable() + .LeftJoin((a, b) => a.material_id == b.id) + .LeftJoin((a, b, c) => a.process_id == c.id) + .LeftJoin((a, b, c, d) => a.workline_id == d.Id) + .LeftJoin((a, b, c, d, e) => e.DictionaryTypeId == DictConst.PrdTaskStatusTypeId && a.mo_task_status == e.EnCode) + .LeftJoin((a,b,c,d,e,f)=>a.eqp_id==f.id) + .LeftJoin((a,b,c,d,e,f,g)=>a.mold_id==g.id) + .Where((a, b) => a.workstation_id == input.stationId && a.mo_task_status != DictConst.ToBeScheduledEncode ) + .Select((a, b, c, d, e,f,g) => new PADPackageTaskPageOutput + { + id = a.id, + mo_task_code = a.mo_task_code, + mo_id = a.mo_id, + material_id = a.material_id, + material_code = b.code, + material_name = b.name, + workline_id = a.workline_id, + workline_name = d.FullName, + bom_id = a.bom_id, + mo_task_status = e.FullName, + complete_qty = SqlFunc.IsNull(a.reported_work_qty,0) + SqlFunc.IsNull(a.scrap_qty,0), + scrap_qty = a.scrap_qty, + scheduled_qty = a.scheduled_qty, + reported_work_qty = a.reported_work_qty, + estimated_start_date = a.estimated_start_date==null ? "" : a.estimated_start_date.Value.ToString("yyyy-MM-dd HH:mm:ss"), + estimated_end_date = a.estimated_end_date==null ? "" : a.estimated_end_date.Value.ToString("yyyy-MM-dd HH:mm:ss"), + parent_id = a.parent_id, + process_id = a.process_id, + process_name = c.process_name, + mbom_process_id = a.mbom_process_id, + create_time = a.create_time, + equip_id = a.eqp_id, + equip_code = f.code, + equip_name = f.name, + mold_id = a.mold_id, + mold_code = g.mold_code, + mold_name = g.mold_name, + schedule_type = a.schedule_type, + }) + .MergeTable() + .OrderByDescending((a) => a.create_time) + .ToPagedListAsync(input.currentPage, input.pageSize); + + return PageResult.SqlSugarPageResult(result); + + } /// - /// pda端根据工位获取组装包装列表 + /// 上模校验 /// /// [HttpPost]