FA/FA_WEB
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Changed string parameters to GUID

Browse Source
This commit is contained in:
Piotr Kus
2025-02-01 07:14:29 +01:00
parent f996b668c2
commit 98777328d7
17 changed files with 43 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SytelineSaAppEfDataModel/Services/CustomerOrderService.cs
View File

@@ -16,21 +16,21 @@ namespace SytelineSaAppEfDataModel.Services
return await context.CustomerOrders.Select(x => mapper.Map<CustomerOrderDto>(x)).ToListAsync();
}
public async Task<CustomerOrderDto?> GetByOrderNumber(string orderNumber)
public async Task<CustomerOrderDto?> GetByOrderNumber(Guid orderNumber)
{
CustomerOrderDto? customerOrder = await context.CustomerOrders
.Where(x => x.CoNum == orderNumber)
.Where(x => x.RowPointer == orderNumber)
.Select(x => mapper.Map<CustomerOrderDto>(x)).FirstOrDefaultAsync();
if (customerOrder == null) return null;
customerOrder.CustomerOrderLines = await context.CustomerOrderLines
.Where(x => x.CoNum == orderNumber)
.Where(x => x.CoNum == customerOrder.CoNum)
.Select(x => mapper.Map<CustomerOrderLineDto>(x)).ToListAsync();
foreach (CustomerOrderLineDto customerOrderLine in customerOrder.CustomerOrderLines)
{
customerOrderLine.CustomerOrderLineItems = await context.CustomerOrderLineItems
.Where(x => x.CoNum == orderNumber && x.CoLine == customerOrderLine.CoLine)
.Where(x => x.CoNum == customerOrder.CoNum && x.CoLine == customerOrderLine.CoLine)
.Select(x => mapper.Map<CustomerOrderLineItemDto>(x)).ToListAsync();
}

28
SytelineSaAppEfDataModel/Services/EdiCustomerOrderService.cs
View File

@@ -36,10 +36,10 @@ namespace SytelineSaAppEfDataModel.Services
{
IList<EdiCustomerOrderDto?> customerOrders = new List<EdiCustomerOrderDto?>();
IList<string> orderNumbers = await context.EdiCustomerOrders.Where(x => x.CreateDate > date)
.Select(x => x.CustomerOrderNumber).ToListAsync();
IList<Guid> orderNumbers = await context.EdiCustomerOrders.Where(x => x.CreateDate > date)
.Select(x => x.RowPointer).ToListAsync();
foreach (string orderNumber in orderNumbers)
foreach (Guid orderNumber in orderNumbers)
{
customerOrders.Add(await GetByOrderNumber(orderNumber));
}
@@ -47,28 +47,28 @@ namespace SytelineSaAppEfDataModel.Services
return customerOrders;
}
public async Task<EdiCustomerOrderDto?> GetByOrderNumber(string customerOrderNumber)
public async Task<EdiCustomerOrderDto?> GetByOrderNumber(Guid customerOrderNumber)
{
EdiCustomerOrderDto ediCustomerOrder = mapper.Map<EdiCustomerOrderDto>(
await context.EdiCustomerOrders.FirstOrDefaultAsync(x => x.RowPointer == customerOrderNumber));
if (ediCustomerOrder == null)
{
return null;
}
IList<EdiCustomerOrderLineDto> ediCustomerOrderLines = await context.EdiCustomerOrderLines
.Where(x => x.CustomerOrderNumber == customerOrderNumber)
.Where(x => x.CustomerOrderNumber == ediCustomerOrder.CustomerOrderNumber)
.Select(x => mapper.Map<EdiCustomerOrderLineDto>(x)).ToListAsync();
foreach (EdiCustomerOrderLineDto ediCustomerOrderLine in ediCustomerOrderLines)
{
ediCustomerOrderLine.EdiCustomerOrderLineItems = await context.EdiCustomerOrderLineItems
.Where(x => x.CustomerOrderNumber == customerOrderNumber &&
.Where(x => x.CustomerOrderNumber == ediCustomerOrder.CustomerOrderNumber &&
x.CustomerOrderLine == ediCustomerOrderLine.CustomerOrderLine)
.Select(x => mapper.Map<EdiCustomerOrderLineItemDto>(x)).ToListAsync();
}
EdiCustomerOrderDto ediCustomerOrder = mapper.Map<EdiCustomerOrderDto>(
await context.EdiCustomerOrders.FirstOrDefaultAsync(x => x.CustomerOrderNumber == customerOrderNumber));
if (ediCustomerOrder == null)
{
return null;
}
IList<EdiCustomerOrderTranslateDto> ediCustomerOrderTranslates = await context.EdiCustomerOrderTranslates
.Where(x => x.EdiCoCoNum == ediCustomerOrder.CustomerOrderNumber)
.Select(x => mapper.Map<EdiCustomerOrderTranslateDto>(x)).ToListAsync();

2
SytelineSaAppEfDataModel/Services/ErrorLogService.cs
View File

@@ -16,7 +16,7 @@ namespace SytelineSaAppEfDataModel.Services
return await context.ErrorLogs.Select(x => mapper.Map<ErrorLogDto>(x)).ToListAsync();
}
public async Task<IEnumerable<ErrorLogDto>> GetByOrderNumber(string customerOrderNumber)
public async Task<IEnumerable<ErrorLogDto>> GetByOrderNumber(Guid customerOrderNumber)
{
return await context.ErrorLogs.Where(x => x.TrxNum == customerOrderNumber)
.Select(x => mapper.Map<ErrorLogDto>(x)).ToListAsync();

2
SytelineSaAppEfDataModel/Services/ICustomerOrderService.cs
View File

@@ -10,6 +10,6 @@ namespace SytelineSaAppEfDataModel.Services
public interface ICustomerOrderService
{
Task<IEnumerable<CustomerOrderDto>> GetAll();
Task<CustomerOrderDto?> GetByOrderNumber(string orderNumber);
Task<CustomerOrderDto?> GetByOrderNumber(Guid orderNumber);
}
}

2
SytelineSaAppEfDataModel/Services/IEdiCustomerOrderService.cs
View File

@@ -11,7 +11,7 @@ namespace SytelineSaAppEfDataModel.Services
{
Task<IEnumerable<EdiCustomerOrderDto>> GetAll();
Task<IEnumerable<EdiCustomerOrderDto?>> GetByDate(DateTime date);
Task<EdiCustomerOrderDto?> GetByOrderNumber(string orderNumber);
Task<EdiCustomerOrderDto?> GetByOrderNumber(Guid orderNumber);
Task<int> SendOrderToSyteline(string customerOrderNumber);
}
}

2
SytelineSaAppEfDataModel/Services/IErrorLogService.cs
View File

@@ -10,6 +10,6 @@ namespace SytelineSaAppEfDataModel.Services
public interface IErrorLogService
{
Task<IEnumerable<ErrorLogDto>> GetAll();
Task<IEnumerable<ErrorLogDto>> GetByOrderNumber(string customerOrderNumber);
Task<IEnumerable<ErrorLogDto>> GetByOrderNumber(Guid customerOrderNumber);
}
}