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

修复bug

Browse Source
This commit is contained in:
18942506660
2023-12-18 15:59:57 +08:00
parent de14aa8965
commit 70cb97a29e
10 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/WMS.Web.Repositories/TakeStockRepositories.cs
View File

@@ -162,8 +162,10 @@ namespace WMS.Web.Repositories
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
public async Task<(List<TakeStockQueryInfoResponse> list, int total)> GetListAsync(TakeStockQueryRequest dto)
public async Task<(List<TakeStockQueryInfoResponse> list, int total)> GetListAsync(TakeStockQueryRequest dto, int companyId = 0)
{
if (companyId == 0)
companyId = _loginRepositories.CompanyId;
//1.获取物料集合
var materials_result = await _erpService.BillQueryForMaterial();
var materials = materials_result.Data.ToList();
@@ -198,8 +200,8 @@ namespace WMS.Web.Repositories
Id = s.order.Id,
BillNo = s.order.BillNo,
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialId),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.detail.StockCode + s.detail.OrgCode),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.detail.SubStockId),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.detail.StockCode + s.detail.OrgCode),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.detail.SubStockId),
Erp_SubStock= _erpBasicDataExtendService.GetStockName(subStocks, s.detail.Erp_SubStockId),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
@@ -220,7 +222,7 @@ namespace WMS.Web.Repositories
public async Task<(object obj, int total)> GetListField(TakeStockQueryRequest dto, int companyId)
{
return await GetListAsync(dto);
return await GetListAsync(dto,companyId);
}
}
}