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

组织和物料

Browse Source
This commit is contained in:
tongfei
2023-11-08 13:41:20 +08:00
parent 296010697e
commit e557e3af4f
1 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs
View File

@@ -26,19 +26,24 @@ namespace WMS.Web.Repositories
private readonly ILoginRepositories _loginRepositories; private readonly ILoginRepositories _loginRepositories;
private readonly RepositoryDbContext _context; private readonly RepositoryDbContext _context;
private readonly ISingleDataService _singleDataService; private readonly ISingleDataService _singleDataService;
private readonly IErpService _erpService;
private readonly IErpBasicDataExtendService _erpBasicDataExtendService;
public InventoryInOutDetailsRepositories(RepositoryDbContext context, public InventoryInOutDetailsRepositories(RepositoryDbContext context,
IMapper mapper, IMapper mapper,
IErpService erpService,
ILoginRepositories loginRepositories, ILoginRepositories loginRepositories,
IServiceProvider serviceProvider, IServiceProvider serviceProvider,
ISingleDataService singleDataService) ISingleDataService singleDataService,
IErpBasicDataExtendService erpBasicDataExtendService)
{ {
_context = context; _context = context;
_mapper = mapper; _mapper = mapper;
_erpService = erpService;
_serviceProvider = serviceProvider; _serviceProvider = serviceProvider;
_loginRepositories = loginRepositories; _loginRepositories = loginRepositories;
_singleDataService = singleDataService; _singleDataService = singleDataService;
_erpBasicDataExtendService = erpBasicDataExtendService;
} }
/// <summary> /// <summary>
@@ -48,11 +53,25 @@ namespace WMS.Web.Repositories
/// <returns></returns> /// <returns></returns>
public async Task<ResultPagedList<InventoryInOutDetailsQueryResponse>> GetPagedList(InventoryInOutDetailsQueryRequest dto) public async Task<ResultPagedList<InventoryInOutDetailsQueryResponse>> GetPagedList(InventoryInOutDetailsQueryRequest dto)
{ {
//1.获取物料集合和组织集合
var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess)
return ResultPagedList<InventoryInOutDetailsQueryResponse>.ReFailure(materials_result);
var materials = materials_result.Data.ToList();
//物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber))
materials = materials.Where(w => EF.Functions.Like(w.MaterialNumber, "%" + dto.MaterialNumber + "%")).ToList();
var query = _context.InventoryInOutDetails var query = _context.InventoryInOutDetails
.Where(adv => 1 == 1); .Where(adv => 1 == 1);
//if (!string.IsNullOrEmpty(dto.MaterialNumber)) //物料ID在模糊后的物料
// query = query.Where(w => EF.Functions.Like(w.detail.BillNo, "%" + dto.BillNo + "%")); if (materials != null && materials.Count != 0 && !string.IsNullOrEmpty(dto.MaterialNumber))
{
var mids = materials.Select(x => x.MaterialId).ToList();
query = query.Where(w => mids.Contains(w.MaterialId));
}
if (dto.StockId.HasValue) if (dto.StockId.HasValue)
query = query.Where(w => w.StockId == dto.StockId.Value); query = query.Where(w => w.StockId == dto.StockId.Value);
@@ -72,10 +91,10 @@ namespace WMS.Web.Repositories
var list = await query.Select(s => new InventoryInOutDetailsQueryResponse() var list = await query.Select(s => new InventoryInOutDetailsQueryResponse()
{ {
Id = s.Id, Id = s.Id,
MaterialName = "", MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialId),
MaterialNumber = "", MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.MaterialId),
Specifications = "", Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialId),
Type=s.Type.GetRemark(), Type =s.Type.GetRemark(),
OrderType=s.OrderType.GetRemark(), OrderType=s.OrderType.GetRemark(),
OrderBillNo=s.OrderBillNo, OrderBillNo=s.OrderBillNo,
Stock = "", Stock = "",