This commit is contained in:
qianhao.xu
2024-04-18 11:36:36 +08:00
parent c1375ad7af
commit d83d634fc4
3 changed files with 35 additions and 4 deletions

View File

@@ -51,9 +51,7 @@ namespace ZR.Service.mes.wms
.AndIF(parm.endtime!=null&&parm.endtime>new DateTime(1999,1,1), it => it.CreatedTime<parm.endtime)
;
//var response = Queryable()
// .Where(predicate.ToExpression())
// .ToPage<WmFgentryInspect, WmFgentryInspectDto>(parm);
List<WmFgentryInspect> inspects = Queryable()
.Where(predicate.ToExpression()).GroupBy(it => it.Workorder)
.Select(it => new WmFgentryInspect()
@@ -75,6 +73,25 @@ namespace ZR.Service.mes.wms
return response;
}
/// <summary>
/// 获取二级菜单
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
public PagedInfo<WmFgentryInspectDto> GetList_second(WmFgentryInspectQueryDto parm)
{
var predicate = Expressionable.Create<WmFgentryInspect>()
.AndIF(!string.IsNullOrEmpty(parm.Workorder), it => it.Workorder.Contains(parm.Workorder))
.AndIF(!string.IsNullOrEmpty(parm.Packcode), it => it.Packcode.Contains(parm.Packcode))
.AndIF(!string.IsNullOrEmpty(parm.Partnumber), it => it.Partnumber.Contains(parm.Partnumber))
.AndIF(parm.starttime != null && parm.starttime > new DateTime(1999, 1, 1), it => it.CreatedTime > parm.starttime)
.AndIF(parm.endtime != null && parm.endtime > new DateTime(1999, 1, 1), it => it.CreatedTime < parm.endtime)
;
var response = Queryable()
.Where(predicate.ToExpression())
.ToPage<WmFgentryInspect, WmFgentryInspectDto>(parm);
return response;
}
/// <summary>