18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v1.0.5' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api into v1.0.5

Browse Source
This commit is contained in:
tongfei
2024-03-27 11:38:07 +08:00
parent 8063ddeeba 81e53613c6
commit 4562469ada
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/WMS.Web.Api/Controllers/OutStockTaskController.cs
View File

@@ -142,13 +142,14 @@ namespace WMS.Web.Api.Controllers
//获取物料对应的仓位
var materialNumbers = res.SelectMany(s => s.details).GroupBy(x => x.MaterialNumber).Select(x => x.Key).ToList();
var stockCodes = res.Select(s => s.StockCode).ToList();
var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, loginInfo.UserInfo.CompanyId);
var orgCodes = res.Select(s => s.OrgCode).ToList();
var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, orgCodes, loginInfo.UserInfo.CompanyId);
foreach (var r in res)
{
r.details.ForEach(x =>
{
x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber).ToList();
x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber && t.StockCode == r.StockCode && t.OrgCode == r.OrgCode).Select(s => s.SubStock).ToList();
});
}
@@ -201,10 +202,11 @@ namespace WMS.Web.Api.Controllers
//获取物料对应的仓位
var materialNumbers = res.details.GroupBy(x => x.MaterialNumber).Select(x => x.Key).ToList();
var stockCodes = new List<string>() { res.StockCode };
var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, loginInfo.UserInfo.CompanyId);
var orgCodes = new List<string>() { res.OrgCode };
var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, orgCodes, loginInfo.UserInfo.CompanyId);
res.details.ForEach(x =>
{
x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber).ToList();
x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber && t.StockCode == res.StockCode && t.OrgCode == res.OrgCode).Select(s => s.SubStock).ToList();
});
return Result<GetOutStockTaskByNoResponse>.ReSuccess(res);

5
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -4639,6 +4639,11 @@
仓库名
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OutStockTask.GetOutStockTaskByNoResponse.OrgCode">
<summary>
组织编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OutStockTask.GetOutStockTaskByNoResponse.details">
<summary>
详情

6
src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs
View File

@@ -26,6 +26,10 @@ namespace WMS.Web.Core.Dto.OutStockTask
///</summary>
public string StockName { get; set; }
/// <summary>
/// 组织编码
///</summary>
public string OrgCode { get; set; }
/// <summary>
/// 详情
/// </summary>
public List<GetOutStockTaskByNoDetailsResponse> details { get; set; } = new List<GetOutStockTaskByNoDetailsResponse>();
@@ -56,6 +60,6 @@ namespace WMS.Web.Core.Dto.OutStockTask
/// <summary>
/// 物料对应的仓位有哪些
/// </summary>
public List<MaterialSubStock> MaterialSubStocks { get; set; } = new List<MaterialSubStock>();
public List<string> MaterialSubStocks { get; set; } = new List<string>();
}
}

2
src/WMS.Web.Repositories/OutStockTaskRepositories.cs
View File

@@ -388,6 +388,7 @@ namespace WMS.Web.Repositories
foreach (var r in response)
{
var entity = list.FirstOrDefault(f => f.Id == r.Id);
r.OrgCode = entity.OrgCode;
r.StockCode = entity.StockCode;
r.StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, entity.StockCode + entity.OrgCode);
}
@@ -420,6 +421,7 @@ namespace WMS.Web.Repositories
if (entity == null) return new GetOutStockTaskByNoResponse();
var response = _mapper.Map<GetOutStockTaskByNoResponse>(entity);
response.OrgCode = entity.OrgCode;
response.StockCode = entity.StockCode;
response.StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, entity.StockCode + entity.OrgCode);
//获取物料信息 显示物料三件套