diff --git a/src/WMS.Web.Api/Controllers/InStockTaskController.cs b/src/WMS.Web.Api/Controllers/InStockTaskController.cs
index 4a1cbf9c..d748b2e4 100644
--- a/src/WMS.Web.Api/Controllers/InStockTaskController.cs
+++ b/src/WMS.Web.Api/Controllers/InStockTaskController.cs
@@ -180,7 +180,8 @@ namespace WMS.Web.Api.Controllers
//获取物料对应的仓位
var materialNumbers = list.GroupBy(x => x.MaterialNumber).Select(x => x.Key).ToList();
var stockCodes = list.GroupBy(x => x.StockCode).Select(x => x.Key).ToList();
- var materialSubStocks= await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, loginInfo.UserInfo.CompanyId);
+ var orgCodes = list.GroupBy(x => x.OrgCode).Select(x => x.Key).ToList();
+ var materialSubStocks= await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, orgCodes, loginInfo.UserInfo.CompanyId);
list.ForEach(x =>
{
x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber).ToList();
@@ -233,7 +234,8 @@ namespace WMS.Web.Api.Controllers
//获取物料对应的仓位
var materialNumbers = list.SelectMany(x=>x.Details).GroupBy(x => x.MaterialNumber).Select(x => x.Key).ToList();
var stockCodes = list.SelectMany(x => x.Details).GroupBy(x => x.StockCode).Select(x => x.Key).ToList();
- var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, loginInfo.UserInfo.CompanyId);
+ var orgCodes = list.SelectMany(x => x.Details).GroupBy(x => x.OrgCode).Select(x => x.Key).ToList();
+ 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();
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index b23e6bce..9d15b19c 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -2208,6 +2208,11 @@
组织
+
+
+ 组织编码
+
+
来源单号
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index ee8125c8..91538029 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -2920,7 +2920,7 @@
-
+
获取物料对应的仓位集合
diff --git a/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoQueryResponse.cs b/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoQueryResponse.cs
index 41638934..7fe44e44 100644
--- a/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoQueryResponse.cs
+++ b/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoQueryResponse.cs
@@ -32,6 +32,11 @@ namespace WMS.Web.Core.Dto.InStockTask
///
public int OrgId { get; set; }
+ ///
+ /// 组织编码
+ ///
+ public string OrgCode { get; set; }
+
///
/// 来源单号
///
diff --git a/src/WMS.Web.Core/Help/HttpClientHelp.cs b/src/WMS.Web.Core/Help/HttpClientHelp.cs
index 02e5250e..f1a6088a 100644
--- a/src/WMS.Web.Core/Help/HttpClientHelp.cs
+++ b/src/WMS.Web.Core/Help/HttpClientHelp.cs
@@ -117,7 +117,7 @@ namespace WMS.Web.Core.Help
HttpClient client = new HttpClient();
//请求头添加其他值
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", reqData.AccessToken);
- client.DefaultRequestHeaders.Add("Refresh-Authorization", reqData.RefreshToken);
+ client.DefaultRequestHeaders.Add("Refresh-Authorization", "Bearer " + reqData.RefreshToken);
client.DefaultRequestHeaders.Connection.Add("Keep-Alive");
client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
client.DefaultRequestHeaders.AcceptCharset.Add(new StringWithQualityHeaderValue ("utf-8"));
diff --git a/src/WMS.Web.Domain/Infrastructure/IInventoryDetailsRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IInventoryDetailsRepositories.cs
index bc04c58c..72bf0952 100644
--- a/src/WMS.Web.Domain/Infrastructure/IInventoryDetailsRepositories.cs
+++ b/src/WMS.Web.Domain/Infrastructure/IInventoryDetailsRepositories.cs
@@ -64,6 +64,6 @@ namespace WMS.Web.Domain.Infrastructure
///
///
///
- Task> GetMaterialSubStocks(List materialNumbers, List stockCodes, int companyId);
+ Task> GetMaterialSubStocks(List materialNumbers, List stockCodes, List orgCodes, int companyId);
}
}
diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
index e2a442ff..073256de 100644
--- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
@@ -340,6 +340,7 @@ namespace WMS.Web.Repositories
DetailsId = s.detail.Id,
SupplierId = s.detail.SupplierId,
OrgId = s.detail.OrgId,
+ OrgCode=s.detail.OrgCode,
SourceBillNo = s.order.SourceBillNo,
StockCode = s.detail.StockCode,
StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.detail.StockCode + s.detail.OrgCode),
diff --git a/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs b/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs
index b513199e..d6a400e1 100644
--- a/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs
+++ b/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs
@@ -233,10 +233,11 @@ namespace WMS.Web.Repositories
///
///
///
- public async Task> GetMaterialSubStocks(List materialNumbers, List stockCodes,int companyId)
+ public async Task> GetMaterialSubStocks(List materialNumbers, List stockCodes, List orgCodes, int companyId)
{
return await _context.InventoryDetails.Where(x => materialNumbers.Contains(x.MaterialNumber) &&
- stockCodes.Contains(x.StockCode)).Select(x=>new MaterialSubStock()
+ stockCodes.Contains(x.StockCode) &&
+ orgCodes.Contains(x.OrgCode)).Select(x=>new MaterialSubStock()
{
MaterialNumber=x.MaterialNumber,
SubStockCode=x.SubStockCode,