diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 26b3e7ea..e17b9d89 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.Repositories/BoxInventoryRepositories.cs b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs index 06fe3c83..ac3b9ffb 100644 --- a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs +++ b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs @@ -348,6 +348,7 @@ namespace WMS.Web.Repositories material = materials.FirstOrDefault(w => w.MaterialNumber.Equals(dto.MaterialNumber) || w.MaterialName.Equals(dto.MaterialNumber) || w.Specifications.Equals(dto.MaterialNumber) + || w.BarCode.Equals(dto.MaterialNumber) ); if (material == null) return new GetPagedListBoxByMaterialResponse(); } @@ -420,7 +421,7 @@ namespace WMS.Web.Repositories SubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.order.SubStockCode + s.order.StockCode + s.order.OrgCode), Qty = s.detail.Qty, }).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); - + if (response.Details.Count > 0) response.SubStock = response.Details.First().SubStock; response.Details = response.Details.Where(w => w.Qty > 0).ToList(); return response; @@ -467,9 +468,9 @@ namespace WMS.Web.Repositories SubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.order.SubStockCode + s.order.StockCode + s.order.OrgCode), Qty = s.detail.Qty, }).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); - + if (response.Details.Count > 0) response.SubStock = response.Details.First().SubStock; - response.Details = response.Details.Where(w=>w.Qty>0).ToList(); + response.Details = response.Details.Where(w => w.Qty > 0).ToList(); return response; } }