diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index efe74924..31723912 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ 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>(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>(json); + datas.ForEach(f => f.wms_co_id = id); list.AddRange(datas); } }