From b4e1f470f5f5a941c149d21dcc9378d6382e30ed Mon Sep 17 00:00:00 2001
From: git_rabbit <zhaozhengyi1b@126.com>
Date: Sat, 7 Mar 2026 17:44:06 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=BA=93=E5=AD=98=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9A=90=E8=97=8F=E9=9B=B6=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在库存DTO中添加IsHideZero属性用于过滤零库存
服务层增加对零库存的过滤条件及按批次号和位置码排序
---
 DOAN.Model/MES/Material/Dto/MmInventoryDto.cs   | 2 ++
 DOAN.Service/MES/Material/MmInventoryService.cs | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs b/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs
index c61e7ec..8b8da93 100644
--- a/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs
+++ b/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs
@@ -15,6 +15,8 @@ namespace DOAN.Model.BZFM.Dto
 
         public string SupplierName { get; set; }
         public string BatchNo { get; set; }
+
+        public bool IsHideZero { get; set; }
     }
     public class MmInventoryRevokeDto
     {
diff --git a/DOAN.Service/MES/Material/MmInventoryService.cs b/DOAN.Service/MES/Material/MmInventoryService.cs
index 0947d7e..f8dbdf9 100644
--- a/DOAN.Service/MES/Material/MmInventoryService.cs
+++ b/DOAN.Service/MES/Material/MmInventoryService.cs
@@ -39,6 +39,8 @@ namespace DOAN.Service.BZFM
                     .Where(sub=>sub.BatchNo == it.BatchNo)
                     .Select(sub => sub.StoveCode)
                 },true)
+                .OrderBy(it => it.BatchNo)
+                .OrderBy(it => it.LocationCode)
                 .ToPage(parm);
 
             return response;
@@ -109,6 +111,10 @@ namespace DOAN.Service.BZFM
                     !string.IsNullOrEmpty(parm.SupplierName),
                     m => m.SupplierName.Contains(parm.SupplierName)
                 )
+                .AndIF(
+                    parm.IsHideZero,
+                    m => m.CurrentQty > 0
+                )
                 .AndIF(!string.IsNullOrEmpty(parm.BatchNo), m => m.BatchNo.Contains(parm.BatchNo));
 
             return predicate;