diff --git a/src/WMS.Web.Domain/Services/Public/JuShuiTanService.cs b/src/WMS.Web.Domain/Services/Public/JuShuiTanService.cs index b2630e74..b7cc5e52 100644 --- a/src/WMS.Web.Domain/Services/Public/JuShuiTanService.cs +++ b/src/WMS.Web.Domain/Services/Public/JuShuiTanService.cs @@ -140,8 +140,9 @@ namespace WMS.Web.Domain.Services.Public item.ky_qty = (item.qty ?? 0) - (item.order_lock ?? 0) + (item.virtual_qty ?? 0) + (item.purchase_qty ?? 0) + (item.in_qty ?? 0) + (item.return_qty ?? 0); } - var resList = list.Where(w => w.qty > 0 || w.ky_qty > 0).ToList(); - return Result>.ReSuccess(resList); + //这里不能过滤掉都是0的 因为要修改 + //var resList = list.Where(w => w.qty > 0 || w.ky_qty > 0).ToList(); + return Result>.ReSuccess(list); } /// diff --git a/src/WMS.Web.Repositories/ProductInventoryRepositories.cs b/src/WMS.Web.Repositories/ProductInventoryRepositories.cs index 69d03534..bc1df4b0 100644 --- a/src/WMS.Web.Repositories/ProductInventoryRepositories.cs +++ b/src/WMS.Web.Repositories/ProductInventoryRepositories.cs @@ -136,7 +136,7 @@ namespace WMS.Web.Repositories var query = _context.ProductInventory .OrderByDescending(o => o.Id) - .Where(adv => 1 == 1); + .Where(adv => 1 == 1 && (adv.Qty > 0 || adv.BeforeQty > 0)); if (!string.IsNullOrEmpty(dto.MaterialNumber)) query = query.Where(w => mNumber.Contains(w.MaterialNumber)); @@ -220,7 +220,7 @@ namespace WMS.Web.Repositories public async Task> GetEntityList(ProductInventoryType type) { var res = await _context.ProductInventory - .Where(f => f.Type==type) + .Where(f => f.Type == type) .ToListAsync(); return res.Clone();