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

1

Browse Source
This commit is contained in:
qianhao.xu 2024-11-15 16:34:34 +08:00
parent c430656351
commit f6cf046da7
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,10 +20,12 @@ namespace DOAN.Model.MES.product.Dto
public DateTime[] TimeRange { get; set; }
public int Status { get; set; }
/// <summary>
/// 仓库确认数
/// </summary>
public int WarehouseconfirmationNum { get; set; }
public int? WarehouseconfirmationNum { get; set; }
}
/// <summary>
@ -43,19 +45,24 @@ namespace DOAN.Model.MES.product.Dto
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; }
public int QualifiedNumber { get; set; }
public int? QualifiedNumber { get; set; }
public int UnqualifiedNumber { get; set; }
public int ReworkNumber { get; set; }
// 报告数和仓库确认数 差异
public int Difference { get; set; }
public int ScrapNumber { get; set; }
public int? UnqualifiedNumber { get; set; }
public int? ReworkNumber { get; set; }
public int? ScrapNumber { get; set; }
public string Remark { get; set; }

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

@ -45,6 +45,8 @@ namespace DOAN.Service.MES.product
.AndIF(parm.WarehouseconfirmationNum>0,(w,r)=>r.QualifiedNumber>0)
.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])
.AndIF(parm.Status>0,(w,r) => w.Status == parm.Status)
;
@ -57,6 +59,12 @@ namespace DOAN.Service.MES.product
ProductionCode=w.ProductionCode,
ProductionName=w.ProductionName,
Specification=w.Specification,
QualifiedNumber = r.QualifiedNumber,
UnqualifiedNumber = r.UnqualifiedNumber,
ReworkNumber = r.ReworkNumber,
ScrapNumber=r.ScrapNumber,
Remark=r.Remark,
Difference = r.QualifiedNumber-r.FinishedNum??0,
FkWorkorder =w.Workorder,
GroupCode = w.GroupCode,
LineCode = w.LineCode,