From a709de05f017c31e386400586f6dbd923f3c7a4a Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Thu, 24 Oct 2024 10:25:18 +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

---
 .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2      | Bin 275060 -> 275060 bytes
 .../Services/ProductInventoryService.cs       |   2 +-
 .../Services/Public/JuShuiTanService.cs       |   2 ++
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index efe74924d9db3e21306a29dd04c3d906505fcce0..3172391247ca5f7dc5fe80d27f80164f3c3cb4e3 100644
GIT binary patch
delta 3512
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

delta 4217
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
RO^MaVjf6e1?wqkU_kRV-ryT$Q

diff --git a/src/WMS.Web.Domain/Services/ProductInventoryService.cs b/src/WMS.Web.Domain/Services/ProductInventoryService.cs
index 94d6c0c0..45bdb651 100644
--- a/src/WMS.Web.Domain/Services/ProductInventoryService.cs
+++ b/src/WMS.Web.Domain/Services/ProductInventoryService.cs
@@ -160,7 +160,7 @@ namespace WMS.Web.Domain.Services
                 //找仓库
                 var l_stock = resStock.Data.FirstOrDefault(f => f.Id == item.wms_co_id);
                 if (l_stock == null) continue;
-                var stock = r.FirstOrDefault(f => f.WarehouseCodeOfLingxing.Equals(l_stock.Name));
+                var stock = r.FirstOrDefault(f => f.WarehouseCodeOfJushuitan.Equals(l_stock.Name));
                 if (stock == null) continue;
 
                 var entity = new ProductInventory()
diff --git a/src/WMS.Web.Domain/Services/Public/JuShuiTanService.cs b/src/WMS.Web.Domain/Services/Public/JuShuiTanService.cs
index 919ae39f..384357c7 100644
--- a/src/WMS.Web.Domain/Services/Public/JuShuiTanService.cs
+++ b/src/WMS.Web.Domain/Services/Public/JuShuiTanService.cs
@@ -109,6 +109,7 @@ namespace WMS.Web.Domain.Services.Public
                 }
                 string json = resData["data"]["inventorys"].ToString();
                 var datas = JsonConvert.DeserializeObject<List<JuShuiTanInventoryResponse>>(json);
+                datas.ForEach(f => f.wms_co_id = id);
                 list.AddRange(datas);
 
                 int count = Convert.ToInt32(resData["data"]["page_count"]);
@@ -125,6 +126,7 @@ namespace WMS.Web.Domain.Services.Public
                     }
                     json = resData["data"]["inventorys"].ToString();
                     datas = JsonConvert.DeserializeObject<List<JuShuiTanInventoryResponse>>(json);
+                    datas.ForEach(f => f.wms_co_id = id);
                     list.AddRange(datas);
                 }
             }