diff --git a/src/WMS.Web.Domain/Services/InStockTaskService.cs b/src/WMS.Web.Domain/Services/InStockTaskService.cs index b118e9cc..26fe8ed2 100644 --- a/src/WMS.Web.Domain/Services/InStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/InStockTaskService.cs @@ -638,14 +638,14 @@ namespace WMS.Web.Domain.Services order.Status = InstockStatus.Wait; else if (details_Groups.Sum(x => x.RealityQtyTotal) <= 0) { - if (order.Type == InstockType.ProduceSotck) - { - order.Status = InstockStatus.Wait; - } - else - { + //if (order.Type == InstockType.ProduceSotck) + // { + // order.Status = InstockStatus.Wait; + // } + // else + // { order.Status = InstockStatus.WaitInStock; - } + //} } else if (details_Groups.Sum(x => x.RealityQtyTotal) >= details_Groups.Sum(x => x.AccruedQtyTotal)) order.Status = InstockStatus.Already; diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index 8b7ebc68..3b9d1a89 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -515,7 +515,7 @@ namespace WMS.Web.Repositories //这里只查状态为:部分入库和等待收货 var task_query = _context.InStockTask - .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)); + .Where(w => EF.Functions.Like(w.SourceBillNo, "%" + dto.SourceBillNo + "%") && w.Type != InstockType.Purchase && w.Type!=InstockType.ProduceSotck && (w.Status == InstockStatus.Part || w.Status == InstockStatus.Wait || w.Status == InstockStatus.WaitInStock)); //找到头列表 var taskList = await task_query