diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 0760b968..d2418d37 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Domain/Services/OutStockTaskService.cs b/src/WMS.Web.Domain/Services/OutStockTaskService.cs index 67eede19..afed4fe6 100644 --- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs @@ -178,7 +178,7 @@ namespace WMS.Web.Domain.Services if (details.Where(w => w.IsRepeal != true).Count() > 0) { detail = details.Where(w => w.IsRepeal != true).FirstOrDefault(); - isAdd = false; + isAdd = false; } if (details.Count() != 0 && details.Count() == details.Where(w => w.IsRepeal == true).Count()) { @@ -584,7 +584,8 @@ namespace WMS.Web.Domain.Services Specifications = m?.Specifications ?? "", BarCode = m?.BarCode ?? "", MaterialName = m?.MaterialName ?? "", - AccruedQty = entity.Details.FirstOrDefault(f => f.Id == detail.ErpDetails.First().DetailId)?.AccruedQty ?? 0 + //AccruedQty = entity.Details.FirstOrDefault(f => f.MaterialNumber == detail.MaterialNumber && f.IsRepeal != true)?.AccruedQty ?? 0 + AccruedQty = entity.Details.FirstOrDefault(f => f.ErpDetails.Where(w => detail.ErpDetails.Select(s => s.Erp_DetailId).Contains(w.Erp_DetailId)).Any())?.AccruedQty ?? 0 }; response.Details.Add(infoDetail); }