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

* Further improvements to generate Packing List

Browse Source
This commit is contained in:
Piotr Kus
2025-05-16 21:48:43 +02:00
parent da1eae8ca9
commit 55f7ed76fd
25 changed files with 474 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OrdersManagement/Components/Layout/MainLayout.razor
View File

@@ -35,14 +35,14 @@
<MenuItem Text="Zamówienia DELFOR" Url="/" IconCss="fa-solid fa-landmark"></MenuItem>
<MenuItem Text="Zarządzanie Indeksami" Url="/Products" IconCss="fa-solid fa-basket-shopping"></MenuItem>
<MenuItem Text="Magazyn" Url="/Warehouse" IconCss="fa-solid fa-warehouse"></MenuItem>
@* <MenuItem Text="Zamówienia klienta EDI" Url="/EdiCustomerOrders" IconCss="fa-solid fa-list-check"></MenuItem> *@
@* <MenuItem Text="Zamówienia klienta" Url="/CustomerOrders" IconCss="fa-solid fa-database"></MenuItem> *@
@if (UserName == "pkus")
@if (IsAdminRoute())
{
<MenuItem Text="Admin" IconCss="fa-solid fa-screwdriver-wrench">
<MenuItem Text="Administracja" Url="/Admin/PK" IconCss="fa-solid fa-screwdriver-wrench">
<MenuItems>
<MenuItem Text = "Użytkownicy" Url = "/Admin/UsersManager" IconCss="fa-solid fa-user-tie"></MenuItem>
<MenuItem Text= "Scheduler" Url = "/Admin/Scheduler" IconCss="fa-solid fa-calendar-week"></MenuItem>
<MenuItem Text="Użytkownicy" Url = "/Admin/PK/UsersManager" IconCss="fa-solid fa-user-tie"></MenuItem>
<MenuItem Text="Scheduler" Url = "/Admin/PK/Scheduler" IconCss="fa-solid fa-calendar-week"></MenuItem>
<MenuItem Text="Zamówienia klienta EDI" Url="/Admin/PK/EdiCustomerOrders" IconCss="fa-solid fa-list-check"></MenuItem>
<MenuItem Text="Zamówienia klienta" Url="/Admin/PK/CustomerOrders" IconCss="fa-solid fa-database"></MenuItem>
</MenuItems>
</MenuItem>
}
@@ -64,6 +64,12 @@
private bool IsAuthenticated { get; set; }
private string UserName { get; set; } = string.Empty;
private bool IsAdminRoute()
{
var path = new Uri(NavigationManager.Uri).AbsolutePath;
return path.StartsWith("/admin", StringComparison.OrdinalIgnoreCase);
}
protected override void OnInitialized()
{
// ClaimsPrincipal currentUser = AuthenticationStateProvider.GetCurrentUser();

2
OrdersManagement/Components/Pages/Admin/Scheduler.razor
View File

@@ -1,4 +1,4 @@
@page "/Admin/Scheduler"
@page "/Admin/PK/Scheduler"
@using System.Security.Claims
@using Microsoft.AspNetCore.Authorization

2
OrdersManagement/Components/Pages/Admin/UsersManager.razor
View File

@@ -1,4 +1,4 @@
@page "/admin/UsersManager"
@page "/Admin/PK/UsersManager"
@using System.Security.Claims
@using Microsoft.AspNetCore.Authorization

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

@@ -1,4 +1,4 @@
@page "/CustomerOrder/{CustomerOrderId:guid}"
@page "/Admin/PK/CustomerOrder/{CustomerOrderId:guid}"
@inject CustomerOrderService CustomerOrderService
@inject ScheduleOrderService ScheduleOrderService

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

@@ -1,4 +1,4 @@
@page "/CustomerOrders"
@page "/Admin/PK/CustomerOrders"
@inject CustomerOrderService CustomerOrderService
@inject NavigationManager NavigationManager

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

@@ -1,4 +1,4 @@
@page "/CustomerOrdersTranslations"
@page "/admin"
@using SytelineSaAppEfDataModel.Dtos
@using Syncfusion.Blazor.Cards

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

@@ -1,4 +1,4 @@
@page "/EdiCustomerOrder/{CustomerOrderId:guid}"
@page "/Admin/PK/EdiCustomerOrder/{CustomerOrderId:guid}"
@inject EdiCustomerOrderService EdiCustomerOrderService
@inject NavigationManager NavigationManager

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

@@ -1,4 +1,4 @@
@page "/EdiCustomerOrders"
@page "/Admin/PK/EdiCustomerOrders"
@inject EdiCustomerOrderService EdiCustomerOrderService
@inject NavigationManager NavigationManager

126
OrdersManagement/Components/Pages/Warehouse.razor
View File

@@ -3,6 +3,10 @@
@using Syncfusion.Blazor.Cards
@using Syncfusion.Blazor.Grids
@using SytelineSaAppEfDataModel.Dtos
@using Syncfusion.Blazor.DropDowns
@using FilterType = Syncfusion.Blazor.Grids.FilterType
@using SelectionMode = Syncfusion.Blazor.Grids.SelectionMode
@using Syncfusion.Blazor.Navigations
@inject WarehouseService WarehouseService
@@ -12,34 +16,41 @@
<h3 class="text-primary">Dokumenty WZ na Magazynie</h3>
</CardHeader>
<CardContent>
@* <SfGrid @ref="" *@
@* AllowFiltering="true" *@
@* AllowPaging="true" *@
@* AllowSorting="true" *@
@* AllowSelection="true" *@
@* TValue="" *@
@* DataSource="" *@
@* EnableAdaptiveUI="true"> *@
@* <GridTemplates> *@
@* <DetailTemplate> *@
@* @{ *@
@* } *@
@* </DetailTemplate> *@
@* </GridTemplates> *@
@* <GridColumns> *@
@* $1$ <GridColumn Field=@nameof(EdiCustomerOrderDto.CustomerOrderNumber) HeaderText="Numer Zamówienia" Width="110"></GridColumn> #1# *@
@* $1$ <GridColumn Field=@nameof(EdiCustomerOrderDto.CustomerPoNumber) HeaderText="Zamówienie Klienta" Width="100"></GridColumn> #1# *@
@* $1$ <GridColumn Field=@nameof(EdiCustomerOrderDto.CustomerNumber) HeaderText="Numer Klienta" Width="90"></GridColumn> #1# *@
@* $1$ <GridColumn Field=@nameof(EdiCustomerOrderDto.CustomerSequence) HeaderText="Odbiorca" Width="80"></GridColumn> #1# *@
@* $1$ <GridColumn Field=@nameof(EdiCustomerOrderDto.CreateDate) HeaderText="Data Otrzymania" TextAlign="TextAlign.Center" Width="110"></GridColumn> #1# *@
@* $1$ <GridColumn Field=@nameof(EdiCustomerOrderDto.SlOrderNumber) HeaderText="Zamówienie SL" Width="100"></GridColumn> #1# *@
@* $1$ <GridColumn Field=@nameof(EdiCustomerOrderDto.SentToSl) HeaderText="Wysłane do SL" TextAlign="TextAlign.Center" Width="80"></GridColumn> #1# *@
@* </GridColumns> *@
@* <GridFilterSettings Type="FilterType.Excel"/> *@
@* <GridPageSettings PageSize="10"/> *@
@* <GridSelectionSettings Mode="SelectionMode.Row" Type="SelectionType.Multiple"/> *@
@* $1$ <GridEvents TValue="EdiCustomerOrderDto" OnRecordDoubleClick="OnRowDoubleClick" RowSelected="RowSelected"/> #1# *@
@* </SfGrid> *@
<h5 class="text-primary mb-3">Klient</h5>
<SfDropDownList TValue="Guid?" TItem="WzClientDto" DataSource="@_clients" Placeholder="Wybierz Klienta">
<DropDownListFieldSettings Value="ID" Text="Name"/>
<DropDownListEvents TValue="Guid?" TItem="WzClientDto" ValueChange="OnValueChange"/>
</SfDropDownList>
@if (_isVisible)
{
<h5 class="text-primary mb-3">Dokumenty WZ</h5>
<SfGrid @ref="_grid"
AllowFiltering="true"
AllowPaging="true"
AllowSorting="true"
AllowSelection="true"
TValue="MaterialTransactionDto"
DataSource="@_materialTransactions"
EnableAdaptiveUI="true">
<GridColumns>
<GridColumn Field=@nameof(MaterialTransactionDto.MTGroupNum) HeaderText="Numer WZ" TextAlign="TextAlign.Center" Width="110"></GridColumn>
<GridColumn Field=@nameof(MaterialTransactionDto.Item) HeaderText="Indeks" TextAlign="TextAlign.Center" Width="80"></GridColumn>
<GridColumn Field=@nameof(MaterialTransactionDto.Qty) HeaderText="Ilość sztuk" TextAlign="TextAlign.Right" Width="90"></GridColumn>
<GridColumn Field=@nameof(MaterialTransactionDto.CreateDate) HeaderText="Data utworzenia" TextAlign="TextAlign.Center" Width="100"></GridColumn>
<GridColumn Field=@nameof(MaterialTransactionDto.RefNum) HeaderText="Numer zamówienia" TextAlign="TextAlign.Center" Width="110"></GridColumn>
</GridColumns>
<SfToolbar>
<ToolbarItems>
<ToolbarItem Type="ItemType.Button" Text="Utwórz Packing List" Id="CreatePackingList"
PrefixIcon="e-icons e-save" OnClick="CreatePackingList"/>
</ToolbarItems>
</SfToolbar>
<GridFilterSettings Type="FilterType.Excel"/>
<GridPageSettings PageSize="10" PageSizes="@(new[] { 10, 20, 50, 100 })"/>
<GridSelectionSettings Mode="SelectionMode.Row" Type="SelectionType.Multiple"/>
@* <GridEvents TValue="EdiCustomerOrderDto" OnRecordDoubleClick="OnRowDoubleClick" RowSelected="RowSelected"/> *@
</SfGrid>
}
</CardContent>
<CardFooter>
<small class="text-muted">FA Krosno Manager © @(DateTime.Now.Year)</small>
@@ -48,11 +59,68 @@
</div>
@code {
private SfGrid<MaterialTransactionDto> _grid;
IEnumerable<WzClientDto> _clients = new List<WzClientDto>();
IEnumerable<MaterialTransactionDto> _materialTransactions = new List<MaterialTransactionDto>();
WzClientDto? _selectedClient;
bool _isVisible = false;
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (firstRender)
{
IEnumerable<MaterialTransactionDto> task = await WarehouseService.GetAllClientWzsAsync("K005531", 0);
_clients = await WarehouseService.GetAllClientsAsync();
StateHasChanged();
}
}
private async Task OnValueChange(ChangeEventArgs<Guid?, WzClientDto> args)
{
if (args.Value.HasValue)
{
_selectedClient = args.ItemData;
_isVisible = true;
_materialTransactions = await WarehouseService.GetAllClientWzsAsync(_selectedClient.CustomerNumber, _selectedClient.CustomerSequence ?? 0);
}
else
{
_selectedClient = null;
_isVisible = false;
}
StateHasChanged();
}
private async Task CreatePackingList()
{
var selectedRecords = await _grid.GetSelectedRecordsAsync();
if (selectedRecords.Any())
{
WzHeaderDto wzHeader = new WzHeaderDto
{
ID = Guid.NewGuid(),
FK_Client = _selectedClient?.ID
};
await WarehouseService.CreateWzHeaderAsync(wzHeader);
switch (_selectedClient?.Name.ToUpper())
{
case "MEYLE":
IList<WzRowMeyleDto> rows = new List<WzRowMeyleDto>();
foreach (MaterialTransactionDto materialTransactionDto in selectedRecords)
{
rows.Add(new WzRowMeyleDto
{
ID = Guid.NewGuid(),
Quantity = Math.Abs((int?)materialTransactionDto.Qty ?? 0),
//ItemNumber =
});
}
break;
}
}
}
}

7
OrdersManagement/Components/Pages/WarehousePackList.razor Normal file
View File

@@ -0,0 +1,7 @@
@page "/Warehouse/PackList"
<h3>WarehousePackList</h3>
@code {
}

30
OrdersManagement/Services/WarehouseService.cs
View File

@@ -2,13 +2,15 @@ using SytelineSaAppEfDataModel.Dtos;
namespace OrdersManagement.Services;
public class WarehouseService
public class WarehouseService(IHttpClientFactory httpClientFactory)
{
private readonly HttpClient _httpClient;
private readonly HttpClient _httpClient = httpClientFactory.CreateClient("FaKrosnoApi");
public WarehouseService(IHttpClientFactory httpClientFactory)
public async Task<IEnumerable<WzClientDto>> GetAllClientsAsync()
{
_httpClient = httpClientFactory.CreateClient("FaKrosnoApi");
var response = await _httpClient.GetAsync($"api/WzClient");
response.EnsureSuccessStatusCode();
return await response.Content.ReadFromJsonAsync<IEnumerable<WzClientDto>>();
}
public async Task<IEnumerable<MaterialTransactionDto>> GetAllClientWzsAsync(string customerNumber, int customerSequence)
@@ -18,4 +20,24 @@ public class WarehouseService
response.EnsureSuccessStatusCode();
return await response.Content.ReadFromJsonAsync<IEnumerable<MaterialTransactionDto>>();
}
public async Task CreateWzHeaderAsync(WzHeaderDto wzHeader)
{
var response = await _httpClient.PostAsJsonAsync("api/WzHeader", wzHeader);
response.EnsureSuccessStatusCode();
if (response.StatusCode != System.Net.HttpStatusCode.Created)
{
throw new Exception("Failed to create WzHeader");
}
}
public async Task CreateWzRowMeyleAsync(IEnumerable<WzRowMeyleDto> wzRowMeyles)
{
var response = await _httpClient.PostAsJsonAsync("api/WzRowMeyle", wzRowMeyles);
response.EnsureSuccessStatusCode();
if (response.StatusCode != System.Net.HttpStatusCode.Created)
{
throw new Exception("Failed to create WzRowMeyle");
}
}
}