From 57df8468fc2cfe5a6ed847bc22a8fc8e8aa0a9e8 Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Wed, 27 Mar 2024 11:25:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/Controllers/InStockTaskController.cs          | 4 ++--
 .../Dto/InStockTask/SourceBillNoNoPurchaseQueryResponse.cs    | 2 +-
 src/WMS.Web.Core/Dto/InStockTask/SourceBillNoQueryResponse.cs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/WMS.Web.Api/Controllers/InStockTaskController.cs b/src/WMS.Web.Api/Controllers/InStockTaskController.cs
index d748b2e4..3c5cf51b 100644
--- a/src/WMS.Web.Api/Controllers/InStockTaskController.cs
+++ b/src/WMS.Web.Api/Controllers/InStockTaskController.cs
@@ -184,7 +184,7 @@ namespace WMS.Web.Api.Controllers
             var materialSubStocks= await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, orgCodes, loginInfo.UserInfo.CompanyId);
             list.ForEach(x => 
             {
-                x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber).ToList();
+                x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber && t.OrgCode==x.OrgCode).Select(x=>x.SubStock).ToList();
             });
 
             return ResultList<SourceBillNoQueryResponse>.ReSuccess(list);
@@ -238,7 +238,7 @@ namespace WMS.Web.Api.Controllers
             var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, orgCodes, loginInfo.UserInfo.CompanyId);
             list.SelectMany(x=>x.Details).ToList().ForEach(x =>
             {
-                x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber).ToList();
+                x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber && t.OrgCode == x.OrgCode).Select(x => x.SubStock).ToList();
             });
 
             return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReSuccess(list);
diff --git a/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoNoPurchaseQueryResponse.cs b/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoNoPurchaseQueryResponse.cs
index c1abb3e2..5108a9c6 100644
--- a/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoNoPurchaseQueryResponse.cs
+++ b/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoNoPurchaseQueryResponse.cs
@@ -143,6 +143,6 @@ namespace WMS.Web.Core.Dto.InStockTask
         /// <summary>
         /// 物料对应的仓位有哪些
         /// </summary>
-        public List<MaterialSubStock> MaterialSubStocks { get; set; } = new List<MaterialSubStock>();
+        public List<string> MaterialSubStocks { get; set; } = new List<string>();
     }
 }
diff --git a/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoQueryResponse.cs b/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoQueryResponse.cs
index 7fe44e44..a3ce2b9e 100644
--- a/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoQueryResponse.cs
+++ b/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoQueryResponse.cs
@@ -94,7 +94,7 @@ namespace WMS.Web.Core.Dto.InStockTask
         /// <summary>
         /// 物料对应的仓位有哪些
         /// </summary>
-        public List<MaterialSubStock> MaterialSubStocks { get; set; } = new List<MaterialSubStock>();
+        public List<string> MaterialSubStocks { get; set; } = new List<string>();
     }