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

5
OrdersManagement/Components/Pages/CustomerOrder.razor
View File

@@ -1,4 +1,4 @@
@page "/CustomerOrder/{CustomerOrderId}"
@page "/CustomerOrder/{CustomerOrderId:guid}"
@inject EdiCustomerOrderService CustomerOrderService
@using SytelineSaAppEfDataModel.Dtos
@@ -7,5 +7,6 @@
<h3>CustomerOrder</h3>
@code {
[Parameter]
public Guid CustomerOrderId { get; set; }
}

2
OrdersManagement/Components/Pages/CustomerOrders.razor
View File

@@ -72,7 +72,7 @@
private void OnRowDoubleClick(GridRowEventArgs<CustomerOrderDto> obj)
{
string customerOrderId = obj.Item.CoNum;
Guid customerOrderId = obj.Item.RowPointer;
NavigationManager.NavigateTo($"/CustomerOrder/{customerOrderId}");
}

4
OrdersManagement/Components/Pages/EdiCustomerOrder.razor
View File

@@ -1,4 +1,4 @@
@page "/EdiCustomerOrder/{CustomerOrderId}"
@page "/EdiCustomerOrder/{CustomerOrderId:guid}"
@inject EdiCustomerOrderService EdiCustomerOrderService
@using SytelineSaAppEfDataModel.Dtos
@@ -202,7 +202,7 @@
@code {
[Parameter]
public string CustomerOrderId { get; set; } = string.Empty;
public Guid CustomerOrderId { get; set; }
List<EdiCustomerOrderDto?>? _ediCustomerOrder;
List<EdiCustomerOrderLineDto> _ediCustomerOrderLines = [];

4
OrdersManagement/Components/Pages/EdiCustomerOrders.razor
View File

@@ -122,7 +122,7 @@
private void OnRowDoubleClick(GridRowEventArgs<EdiCustomerOrderDto> obj)
{
string customerOrderId = obj.Item.CustomerOrderNumber;
Guid customerOrderId = obj.Item.RowPointer;
NavigationManager.NavigateTo($"/EdiCustomerOrder/{customerOrderId}");
}
@@ -135,7 +135,7 @@
foreach (EdiCustomerOrderDto selectedEdiCustomerOrder in _selectedEdiCustomerOrders)
{
ResponseDto response = await EdiCustomerOrderService.SendOrderToSyteline(selectedEdiCustomerOrder.CustomerOrderNumber);
ResponseDto response = await EdiCustomerOrderService.SendOrderToSyteline(selectedEdiCustomerOrder.RowPointer, selectedEdiCustomerOrder.CustomerOrderNumber);
if (response.Status == 1)
{

4
OrdersManagement/Services/CustomerOrderService.cs
View File

@@ -9,9 +9,9 @@ public class CustomerOrderService(HttpClient httpClient)
return await httpClient.GetFromJsonAsync<IEnumerable<CustomerOrderDto>>("api/CustomerOrders");
}
public async Task<CustomerOrderDto?> GetCustomerOrderAsync(string customerOrderNumber)
public async Task<CustomerOrderDto?> GetCustomerOrderAsync(Guid customerOrderNumber)
{
return await httpClient.GetFromJsonAsync<CustomerOrderDto>(
$"api/CustomerOrders/by-order-number/?customerOrderNumber={Uri.EscapeDataString(customerOrderNumber)}");
$"api/CustomerOrders/by-order-number/?customerOrderNumber={customerOrderNumber}");
}
}

14
OrdersManagement/Services/EdiCustomerOrderService.cs
View File

@@ -10,32 +10,32 @@ namespace OrdersManagement.Services
return await httpClient.GetFromJsonAsync<IEnumerable<EdiCustomerOrderDto>>("api/EdiCustomerOrders");
}
public async Task<EdiCustomerOrderDto?> GetEdiCustomerOrderAsync(string customerOrderNumber)
public async Task<EdiCustomerOrderDto?> GetEdiCustomerOrderAsync(Guid customerOrderNumber)
{
return await httpClient.GetFromJsonAsync<EdiCustomerOrderDto>(
$"api/EdiCustomerOrders/by-order-number/?customerOrderNumber={Uri.EscapeDataString(customerOrderNumber)}");
$"api/EdiCustomerOrders/by-order-number/?customerOrderNumber={customerOrderNumber}");
}
public async Task<ResponseDto> SendOrderToSyteline(string customerOrderNumber)
public async Task<ResponseDto> SendOrderToSyteline(Guid customerOrderNumber, string orderNumber)
{
HttpResponseMessage responseMessage = await httpClient.PostAsync(
$"api/EdiCustomerOrders/send-to-syteline?customerOrderNumber={Uri.EscapeDataString(customerOrderNumber)}", null);
$"api/EdiCustomerOrders/send-to-syteline?customerOrderNumber={customerOrderNumber}", null);
if (responseMessage.IsSuccessStatusCode)
{
return new ResponseDto(1, customerOrderNumber, null, null);
return new ResponseDto(1, orderNumber, null, null);
}
string? errorMessage = null;
IEnumerable<ErrorLogDto>? logs = await httpClient.GetFromJsonAsync<IEnumerable<ErrorLogDto>>(
$"api/ErrorLog/by-order-number/?customerOrderNumber={Uri.EscapeDataString(customerOrderNumber)}");
$"api/ErrorLog/by-order-number/?customerOrderNumber={customerOrderNumber}");
if (logs != null)
{
errorMessage = string.Join("\r\n", logs.Select(x => x.ErrMsg));
}
return new ResponseDto(0, customerOrderNumber, errorMessage, null);
return new ResponseDto(0, orderNumber, errorMessage, null);
}
}
}