RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

提交

Browse Source
This commit is contained in:
qianhao.xu 2024-11-08 10:04:38 +08:00
parent e9c1020966
commit ff34405f80
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DOAN.Model/MES/product/Dto/ProReportworkDto.cs
View File

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

7
DOAN.Service/MES/product/ProReportworkService.cs
View File

@ -39,8 +39,8 @@ namespace DOAN.Service.MES.product
}
var predicate = Expressionable.Create<ProWorkorder, ProReportwork>()
.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,