订单功能逻辑修改
This commit is contained in:
@@ -25,7 +25,7 @@ namespace DOAN.Service.MES.Order
|
||||
{
|
||||
var predicate = QueryExp(parm);
|
||||
var queryResult = Context.Queryable<OrderPurchase>()
|
||||
.LeftJoin<ProWorkorder>((o, w) => o.OrderNoMes == w.FeedOrder)
|
||||
.LeftJoin<ProWorkorder>((o, w) => o.OrderNoMes == w.CustomerOrder)
|
||||
.Where(predicate.ToExpression())
|
||||
.Where((o, w) => !SqlFunc.IsNullOrEmpty(o.OrderNoMes))
|
||||
.OrderBy((o, w) => o.Id)
|
||||
@@ -61,7 +61,7 @@ namespace DOAN.Service.MES.Order
|
||||
UpdatedBy = o.UpdatedBy,
|
||||
UpdatedTime = o.UpdatedTime,
|
||||
Children = SqlFunc.Subqueryable<ProWorkorder>()
|
||||
.Where(w => w.FeedOrder == o.OrderNoMes) // 子查询,获取对应的工单数据
|
||||
.Where(w => w.CustomerOrder == o.OrderNoMes) // 子查询,获取对应的工单数据
|
||||
.ToList()
|
||||
})
|
||||
.Distinct()
|
||||
|
||||
Reference in New Issue
Block a user