diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index ebbc33b0..f24215ed 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/OutStockTaskService.cs b/src/WMS.Web.Domain/Services/OutStockTaskService.cs
index 152183e0..d6fa54a0 100644
--- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs
+++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs
@@ -1,7 +1,12 @@
 using AutoMapper;
 using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using NPOI.HSSF.Record.Chart;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.Design;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -22,10 +27,6 @@ using WMS.Web.Domain.IService.Public;
 using WMS.Web.Domain.Services.Public;
 using WMS.Web.Domain.Values;
 using WMS.Web.Domain.Values.Single;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using NPOI.HSSF.Record.Chart;
 
 namespace WMS.Web.Domain.Services
 {
@@ -669,7 +670,9 @@ namespace WMS.Web.Domain.Services
                     BoxWeight = b.BoxWeight,
                     Qty = b.Qty,
                     position_code = b.SubStockCode,
-                    position = postionList.FirstOrDefault(f=>f.position_code==b.SubStockCode)?.position??"",
+                     position = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, b.SubStockCode+outStock.StockCode + outStock.OrgCode),
+                    //shelfSpace = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, x.order.SubStockCode + x.order.StockCode + x.order.OrgCode),
+                    //  position = postionList.FirstOrDefault(f=>f.position_code==b.SubStockCode)?.position??"",
                     SerialNumbers = string.Join(",", b.SerialNumbers),
                     SerialNumberList = b.SerialNumbers,
                     Method = outStock.Method.GetRemark(),
diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
index 9511f7a7..5ae038f9 100644
--- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
@@ -208,8 +208,8 @@ namespace WMS.Web.Repositories
                          ReceiveQty = x.detail.Qty,
                          ShelfTime = x.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
                          shelfSpaceCode= x.order.SubStockCode,
-                          
-                         shelfSpace = _boxRepositories.Getuc_warehouse_position(postionList, x.order.SubStockCode),
+                         shelfSpace = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, x.order.SubStockCode + x.order.StockCode + x.order.OrgCode),
+                         //shelfSpace = _boxRepositories.Getuc_warehouse_position(postionList, x.order.SubStockCode),
                          Shelfer = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, x.order.CreatorId),
                          Receiver = "",
                          ReceiveTime = "",