Teams/kunshan-bzfm-mes-backend
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
qianhao.xu
2024-12-03 20:13:34 +08:00
parent 34ffda9557
commit 3ae2ceb7d9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DOAN.Model/MES/Product/Dto/ProReportworkDto.cs
View File

@@ -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; }

2
DOAN.Service/MES/Product/ProReportworkService.cs
View File

@@ -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])