From ec0be490e17a9e3248d3dce66404fb3f33a72bae Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Fri, 1 Nov 2024 17:47:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Domain/Services/Public/JuShuiTanService.cs   | 5 +++--
 src/WMS.Web.Repositories/ProductInventoryRepositories.cs | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

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<List<JuShuiTanInventoryResponse>>.ReSuccess(resList);
+            //这里不能过滤掉都是0的 因为要修改
+            //var resList = list.Where(w => w.qty > 0 || w.ky_qty > 0).ToList();
+            return Result<List<JuShuiTanInventoryResponse>>.ReSuccess(list);
         }
 
         /// <summary>
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<List<ProductInventory>> GetEntityList(ProductInventoryType type)
         {
             var res = await _context.ProductInventory
-                .Where(f => f.Type==type)
+                .Where(f => f.Type == type)
                 .ToListAsync();
 
             return res.Clone();