From 3ae2ceb7d9c84b2d04161743fabc56e0d0350800 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Tue, 3 Dec 2024 20:13:34 +0800 Subject: [PATCH] 1 --- DOAN.Model/MES/Product/Dto/ProReportworkDto.cs | 4 ++-- DOAN.Service/MES/Product/ProReportworkService.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DOAN.Model/MES/Product/Dto/ProReportworkDto.cs b/DOAN.Model/MES/Product/Dto/ProReportworkDto.cs index 3cac655..66ea080 100644 --- a/DOAN.Model/MES/Product/Dto/ProReportworkDto.cs +++ b/DOAN.Model/MES/Product/Dto/ProReportworkDto.cs @@ -10,7 +10,7 @@ namespace DOAN.Model.BZFM.Dto public string RouteCode { get; set; } - public string ProcessCode { get; set; } + public int ProcessId { get; set; } public string Worker { get; set; } @@ -29,7 +29,7 @@ namespace DOAN.Model.BZFM.Dto public string RouteCode { get; set; } - public string ProcessCode { get; set; } + public int ProcessId { get; set; } public int? PlanNum { get; set; } diff --git a/DOAN.Service/MES/Product/ProReportworkService.cs b/DOAN.Service/MES/Product/ProReportworkService.cs index c18605b..4b757fd 100644 --- a/DOAN.Service/MES/Product/ProReportworkService.cs +++ b/DOAN.Service/MES/Product/ProReportworkService.cs @@ -77,7 +77,7 @@ namespace DOAN.Service.MES.product .AndIF(!string.IsNullOrEmpty(parm.Workorder), it => it.Workorder.Contains(parm.Workorder)) .AndIF(!string.IsNullOrEmpty(parm.Worker), it => it.Worker.Contains(parm.Worker)) .AndIF(!string.IsNullOrEmpty(parm.RouteCode), it => it.RouteCode==parm.RouteCode) - .AndIF(!string.IsNullOrEmpty(parm.ProcessCode), it => it.ProcessCode==parm.ProcessCode) + .AndIF(parm.ProcessId>0, it => it.ProcessId==parm.ProcessId) .AndIF(parm.JobDate != null && parm.JobDate[0] > DateTime.MinValue, it => it.JobDate >= parm.JobDate[0]) .AndIF(parm.JobDate != null && parm.JobDate[1] > DateTime.MinValue, it => it.JobDate <= parm.JobDate[1])