bug修复
This commit is contained in:
@@ -253,7 +253,7 @@ namespace WMS.Web.Repositories
|
|||||||
var query = _context.InStockTaskDetails
|
var query = _context.InStockTaskDetails
|
||||||
.GroupJoin(_context.InStockTask, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
|
.GroupJoin(_context.InStockTask, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
|
||||||
.SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
|
.SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
|
||||||
.Where(w => EF.Functions.Like(w.order.SourceBillNo, "%" + dto.SourceBillNo + "%") && (w.order.Status == InstockStatus.Part || w.order.Status == InstockStatus.Wait || w.order.Status== InstockStatus.WaitInStock));
|
.Where(w => EF.Functions.Like(w.order.SourceBillNo, "%" + dto.SourceBillNo + "%") && w.order.Type == InstockType.Purchase && (w.order.Status == InstockStatus.Part || w.order.Status == InstockStatus.Wait || w.order.Status== InstockStatus.WaitInStock));
|
||||||
|
|
||||||
//仓库
|
//仓库
|
||||||
if (!string.IsNullOrEmpty(dto.StockCode))
|
if (!string.IsNullOrEmpty(dto.StockCode))
|
||||||
@@ -319,7 +319,7 @@ namespace WMS.Web.Repositories
|
|||||||
|
|
||||||
//这里只查状态为:部分入库和等待收货
|
//这里只查状态为:部分入库和等待收货
|
||||||
var task_query = _context.InStockTask
|
var task_query = _context.InStockTask
|
||||||
.Where(w => EF.Functions.Like(w.SourceBillNo, "%" + dto.SourceBillNo + "%") && (w.Status == InstockStatus.Part || w.Status == InstockStatus.Wait || w.Status==InstockStatus.WaitInStock));
|
.Where(w => EF.Functions.Like(w.SourceBillNo, "%" + dto.SourceBillNo + "%") && w.Type!= InstockType.Purchase && (w.Status == InstockStatus.Part || w.Status == InstockStatus.Wait || w.Status==InstockStatus.WaitInStock));
|
||||||
|
|
||||||
//找到头列表
|
//找到头列表
|
||||||
var taskList = await task_query
|
var taskList = await task_query
|
||||||
|
|||||||
Reference in New Issue
Block a user