From ff34405f804369e61902ab7c97238fab9d72f4cf Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Fri, 8 Nov 2024 10:04:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DOAN.Model/MES/product/Dto/ProReportworkDto.cs | 6 ++++++ DOAN.Service/MES/product/ProReportworkService.cs | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/DOAN.Model/MES/product/Dto/ProReportworkDto.cs b/DOAN.Model/MES/product/Dto/ProReportworkDto.cs index 78a97da..f3f1372 100644 --- a/DOAN.Model/MES/product/Dto/ProReportworkDto.cs +++ b/DOAN.Model/MES/product/Dto/ProReportworkDto.cs @@ -36,6 +36,12 @@ namespace DOAN.Model.MES.product.Dto public int? FinishedNum { get; set; } + + public string ProductionCode { get; set; } + public string ProductionName { get; set; } + + public string Specification { get; set; } + public string GroupCode { get; set; } public string LineCode { get; set; } diff --git a/DOAN.Service/MES/product/ProReportworkService.cs b/DOAN.Service/MES/product/ProReportworkService.cs index 3857785..4d74ca0 100644 --- a/DOAN.Service/MES/product/ProReportworkService.cs +++ b/DOAN.Service/MES/product/ProReportworkService.cs @@ -39,8 +39,8 @@ namespace DOAN.Service.MES.product } var predicate = Expressionable.Create() .AndIF(!string.IsNullOrEmpty(parm.FkWorkorder), (w, r) => w.Workorder.Contains(parm.FkWorkorder)) - .AndIF(!string.IsNullOrEmpty(parm.GroupCode), (w, r) => w.GroupCode == parm.FkWorkorder) - .AndIF(!string.IsNullOrEmpty(parm.LineCode), (w, r) => w.LineCode == parm.FkWorkorder) + .AndIF(!string.IsNullOrEmpty(parm.GroupCode), (w, r) => w.GroupCode == parm.GroupCode) + .AndIF(!string.IsNullOrEmpty(parm.LineCode), (w, r) => w.LineCode == parm.LineCode) .AndIF(parm.TimeRange != null && parm.TimeRange.Length == 2 && parm.TimeRange[0] > DateTime.MinValue, (w, r) => w.WorkorderDate >= parm.TimeRange[0]) .AndIF(parm.TimeRange != null && parm.TimeRange.Length == 2 && parm.TimeRange[1] > DateTime.MinValue, (w, r) => w.WorkorderDate <= parm.TimeRange[1]) ; @@ -52,6 +52,9 @@ namespace DOAN.Service.MES.product .Select((w, r) => new ProReportworkDto { Id = r.Id, + ProductionCode=w.ProductionCode, + ProductionName=w.ProductionName, + Specification=w.Specification, FkWorkorder =w.Workorder, GroupCode = w.GroupCode, LineCode = w.LineCode,