|
@@ -166,7 +166,10 @@ namespace ZR.Service.Business.Inspect
|
|
predicate.AndIF(parm != null && !string.IsNullOrEmpty(parm.BomNo), x => x.BomNo.Contains(parm.BomNo));
|
|
predicate.AndIF(parm != null && !string.IsNullOrEmpty(parm.BomNo), x => x.BomNo.Contains(parm.BomNo));
|
|
//predicate.And(x => x.Qty > x.CheckQty);
|
|
//predicate.And(x => x.Qty > x.CheckQty);
|
|
//predicate.And(x => x.CheckResult == "Wait");
|
|
//predicate.And(x => x.CheckResult == "Wait");
|
|
- predicate.And(x => x.SubmitInspectResult == false);
|
|
|
|
|
|
+ if (!parm.IsPrintQuery)
|
|
|
|
+ {
|
|
|
|
+ predicate.And(x => x.SubmitInspectResult == false);
|
|
|
|
+ }
|
|
//搜索条件查询语法参考Sqlsugar
|
|
//搜索条件查询语法参考Sqlsugar
|
|
var response = Queryable()
|
|
var response = Queryable()
|
|
.Distinct()
|
|
.Distinct()
|
|
@@ -176,18 +179,18 @@ namespace ZR.Service.Business.Inspect
|
|
return response.Adapt<List<SapDeliverDto>>();
|
|
return response.Adapt<List<SapDeliverDto>>();
|
|
}
|
|
}
|
|
|
|
|
|
- public List<SapDeliverRecordDto> GetSapDeliverRecordList(string deliverNo)
|
|
|
|
|
|
+ public PagedInfo<SapDeliverRecordDto> GetSapDeliverRecordList(PrintLabelQueryDto parm)
|
|
{
|
|
{
|
|
//开始拼装查询条件
|
|
//开始拼装查询条件
|
|
var predicate = Expressionable.Create<SapDeliverRecord>();
|
|
var predicate = Expressionable.Create<SapDeliverRecord>();
|
|
- predicate.And(x => x.DeliverNo == deliverNo);
|
|
|
|
- //predicate.And(x => x.Qty > x.CheckQty);
|
|
|
|
|
|
+ predicate.And(x => x.DeliverNo == parm.DeliverNo);
|
|
|
|
+ predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialSpec), x => x.MaterialSpec == parm.MaterialSpec.Trim());
|
|
//搜索条件查询语法参考Sqlsugar
|
|
//搜索条件查询语法参考Sqlsugar
|
|
var response = Queryable()
|
|
var response = Queryable()
|
|
.Where(predicate.ToExpression())
|
|
.Where(predicate.ToExpression())
|
|
- .OrderBy(x => x.Id).ToList();
|
|
|
|
|
|
+ .OrderBy(x => x.Id).ToPage(parm);
|
|
|
|
|
|
- return response.Adapt<List<SapDeliverRecordDto>>();
|
|
|
|
|
|
+ return response.Adapt<PagedInfo<SapDeliverRecordDto>>();
|
|
}
|
|
}
|
|
|
|
|
|
public SapDeliverRecordSumDto GetSapDeliverRecordSum(string materialSpecCode, string deliverNo)
|
|
public SapDeliverRecordSumDto GetSapDeliverRecordSum(string materialSpecCode, string deliverNo)
|
|
@@ -225,17 +228,18 @@ namespace ZR.Service.Business.Inspect
|
|
predicate.And(x => x.DeliverNo == parm.DeliverNo);
|
|
predicate.And(x => x.DeliverNo == parm.DeliverNo);
|
|
//搜索条件查询语法参考Sqlsugar
|
|
//搜索条件查询语法参考Sqlsugar
|
|
var response = Queryable()
|
|
var response = Queryable()
|
|
- .GroupBy(x => new { x.MaterialCode, x.MaterialName, x.MaterialSpec })
|
|
|
|
|
|
+ .GroupBy(x => new { x.MaterialCode, x.MaterialName, x.MaterialSpec, x.KeyFlag })
|
|
.Where(predicate.ToExpression())
|
|
.Where(predicate.ToExpression())
|
|
.Select(x => new SapDeliverRecordSumDto
|
|
.Select(x => new SapDeliverRecordSumDto
|
|
{
|
|
{
|
|
MaterialCode = x.MaterialCode,
|
|
MaterialCode = x.MaterialCode,
|
|
MaterialName = x.MaterialName,
|
|
MaterialName = x.MaterialName,
|
|
MaterialSpec = x.MaterialSpec,
|
|
MaterialSpec = x.MaterialSpec,
|
|
|
|
+ KeyFlag = x.KeyFlag,
|
|
SumQty = SqlFunc.AggregateSum(x.Qty),
|
|
SumQty = SqlFunc.AggregateSum(x.Qty),
|
|
SumCheckQty = (int)SqlFunc.AggregateSum(x.CheckQty),
|
|
SumCheckQty = (int)SqlFunc.AggregateSum(x.CheckQty),
|
|
})
|
|
})
|
|
- .HavingIF(parm.IsComplate==true,x=>x.SumQty>x.SumCheckQty).ToPage(parm);
|
|
|
|
|
|
+ .HavingIF(parm.IsComplate == true, x => x.SumQty > x.SumCheckQty).ToPage(parm);
|
|
return response;
|
|
return response;
|
|
}
|
|
}
|
|
public bool GetSapDeliverIsAllChecked(string deliverNo)
|
|
public bool GetSapDeliverIsAllChecked(string deliverNo)
|