diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskIssueListOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskIssueListOutput.cs index c012f431..909bccff 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskIssueListOutput.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskIssueListOutput.cs @@ -47,5 +47,6 @@ namespace Tnb.ProductionMgr.Entities.Dto /// 物料型号 /// public string? f_flowid { get; set; } + public string batch { get; set; } } } \ No newline at end of file diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs index f2a11f5f..ff3b6651 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs @@ -131,7 +131,8 @@ namespace Tnb.ProductionMgr nightshift_worker_id = a.nightshift_worker_id, nightshiftafter_worker_id = a.nightshiftafter_worker_id, reported_work_qty = a.reported_work_qty, - scrap_qty = a.scrap_qty + scrap_qty = a.scrap_qty, + batch = a.is_hand_set_batch==1 ? a.batch : "", }).OrderByDescending(a => a.create_time).ToPagedListAsync(input.currentPage, input.pageSize); List userIdList = result.list.Select(x => x.dayshift_worker_id).Distinct().ToList();