修复bug
This commit is contained in:
@@ -139,7 +139,7 @@ namespace WMS.Web.Repositories
|
||||
.OrderByDescending(o => o.changeBox.Id)
|
||||
.Where(adv => 1 == 1);
|
||||
|
||||
if (ids.Count() > 0)
|
||||
if (!string.IsNullOrEmpty(dto.Creator))
|
||||
query = query.Where(w => ids.Contains(w.changeBox.CreatorId));
|
||||
if (!string.IsNullOrEmpty(dto.SrcBox))
|
||||
query = query.Where(w => EF.Functions.Like(w.srcBox.BoxBillNo, "%" + dto.SrcBox + "%"));
|
||||
|
||||
@@ -129,7 +129,7 @@ namespace WMS.Web.Repositories
|
||||
query = query.Where(w => w.moveBox.SrcSubStockId == dto.SrcSubStockId);
|
||||
if (dto.DestSubStockId != null)
|
||||
query = query.Where(w => w.moveBox.DestSubStockId == dto.DestSubStockId);
|
||||
if (ids.Count() > 0)
|
||||
if (!string.IsNullOrEmpty(dto.Creator))
|
||||
query = query.Where(w => ids.Contains(w.moveBox.CreatorId));
|
||||
if (!string.IsNullOrEmpty(dto.Box))
|
||||
query = query.Where(w => EF.Functions.Like(w.box.BoxBillNo, "%" + dto.Box + "%"));
|
||||
|
||||
@@ -129,9 +129,9 @@ namespace WMS.Web.Repositories
|
||||
else//查其他单据(组织)
|
||||
query = query.Where(w => rec_id == w.order.ReceiptCustomerId && w.order.Type != OutStockType.Sal);
|
||||
}
|
||||
if (mIds.Count() != 0)
|
||||
if (!string.IsNullOrEmpty(dto.MaterialNumber))
|
||||
query = query.Where(w => mIds.Contains(w.detail.MaterialId));
|
||||
if (ids.Count() > 0)
|
||||
if (!string.IsNullOrEmpty(dto.Creator))
|
||||
query = query.Where(w => ids.Contains(w.order.CreatorId));
|
||||
if (!string.IsNullOrEmpty(dto.SourceBillNo))
|
||||
query = query.Where(w => w.detail.ErpDetails.Where(wd => EF.Functions.Like(wd.SourceBillNo, "%" + dto.SourceBillNo + "%")).Select(s => s.DetailId).Contains(w.detail.Id));
|
||||
|
||||
@@ -256,7 +256,7 @@ namespace WMS.Web.Repositories
|
||||
else//查其他单据(组织)
|
||||
query = query.Where(w => rec_id == w.order.ReceiptCustomerId && w.order.Type != OutStockType.Sal);
|
||||
}
|
||||
if (mIds.Count() != 0)
|
||||
if (!string.IsNullOrEmpty(dto.MaterialNumber))
|
||||
query = query.Where(w => mIds.Contains(w.detail.MaterialId));
|
||||
if (dto.Ids.Count() > 0)
|
||||
query = query.Where(w => dto.Ids.Contains(w.detail.Id));
|
||||
|
||||
Reference in New Issue
Block a user