diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 73ad28c7..26b3e7ea 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 7103d673..06fe3c83 100644 --- a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs +++ b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs @@ -378,8 +378,8 @@ 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(); - + response.Details = response.Details.Where(w => w.Qty > 0).ToList(); return response; } /// @@ -422,6 +422,7 @@ namespace WMS.Web.Repositories }).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; } /// @@ -440,7 +441,7 @@ namespace WMS.Web.Repositories materials = materials_result.Data.ToList(); var r = await _basicsRepositories.GetSubUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), dto.SubStock, companyId); - var subStock = r.FirstOrDefault(f => f.Name.Equals(dto.StockCode)); + var subStock = r.FirstOrDefault(f => f.Name.Equals(dto.SubStock)); if (subStock == null) return new GetPagedListBoxBySubStockResponse(); var query = _context.BoxInventoryDetails @@ -468,6 +469,7 @@ namespace WMS.Web.Repositories }).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; } }