From 0ce27506cd8e5bd0c8b0c2526f0a5738c2e72dff Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Mon, 30 Sep 2024 16:22:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=A1=91=E6=8C=A4=E5=87=BA=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=E5=88=97=E8=A1=A8=E9=A1=B5=E6=98=BE=E7=A4=BA=E6=89=B9?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dto/PrdManage/PrdMoTaskIssueListOutput.cs | 1 + ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) 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();