From 7d8bbd83a28b8499cab12db3b8dd59ee9209ecb5 Mon Sep 17 00:00:00 2001
From: majian <780924089@qq.com>
Date: Tue, 12 Nov 2024 11:38:34 +0800
Subject: [PATCH] 1

---
 WarehouseMgr/Tnb.WarehouseMgr/WmsStockReportService.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsStockReportService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsStockReportService.cs
index a0b40cd0..292c56d1 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsStockReportService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsStockReportService.cs
@@ -69,7 +69,7 @@ namespace Tnb.WarehouseMgr
                 .WhereIF(!string.IsNullOrEmpty(container_no), (a, b, c, d, e, f) => f.material_standard.Contains(container_no))
                 .WhereIF(!string.IsNullOrEmpty(material_code), (a, b, c, d, e, f) => f.code.Contains(material_code))
                 .WhereIF(!string.IsNullOrEmpty(warehouse_id), (a, b, c, d, e, f) => c.wh_id == warehouse_id)
-                .Where((a, b, c, d, e, f) => c.is_type == ((int)EnumLocationType.存储库位).ToString())
+                .Where((a, b, c, d, e, f) => c.is_type == ((int)EnumLocationType.存储库位).ToString() || c.is_type == ((int)EnumLocationType.人工管理库位).ToString())
                 .Select((a, b, c, d, e, f, g, h, i) => new WmsStockReportH
                 {
                     org_id = e.org_id,
@@ -145,7 +145,7 @@ namespace Tnb.WarehouseMgr
                 .WhereIF(!string.IsNullOrEmpty(container_no), (a, b, c, d, e, f, g, h) => f.material_standard.Contains(container_no))
                 .WhereIF(!string.IsNullOrEmpty(material_code), (a, b, c, d, e, f) => f.code.Contains(material_code))
                 .WhereIF(!string.IsNullOrEmpty(warehouse_id), (a, b, c, d, e, f) => c.wh_id == warehouse_id)
-                .Where((a, b, c, d, e, f) => c.is_type == ((int)EnumLocationType.存储库位).ToString())
+                .Where((a, b, c, d, e, f) => c.is_type == ((int)EnumLocationType.存储库位).ToString() || c.is_type == ((int)EnumLocationType.人工管理库位).ToString())
                 .Select((a, b, c, d, e, f, g, h, i) => new WmsStockReportH
                 {
                     org_id = e.org_id,