* Further improvements for Marelli PackingList

2025-09-11 21:08:31 +02:00
parent 50a25ff996
commit 01350f0146
10 changed files with 420 additions and 39 deletions
--- a/OrdersManagement/Components/Pages/PackingLists/Marelli/MarelliPackList.razor
+++ b/OrdersManagement/Components/Pages/PackingLists/Marelli/MarelliPackList.razor
@@ -67,22 +67,19 @@
                <GridColumns>
                    <GridColumn Field=@nameof(WzRowMarelliDto.ID) IsPrimaryKey="true" Visible="false" AllowEditing="false"
                                TextAlign="TextAlign.Center" HeaderText="ID" Width="70"></GridColumn>
-                    <GridColumn Field=@nameof(WzRowMarelliDto.OrderNumber) AllowEditing="false"
-                                TextAlign="TextAlign.Center" HeaderText="Numer Zamówienia Meyle"
-                                Width="70"></GridColumn>
-                    <GridColumn Field=@nameof(WzRowMarelliDto.FaIndex) AllowEditing="false" AllowFiltering="true"
-                                TextAlign="TextAlign.Center" HeaderText="Numer Indeksu FA" Width="100"></GridColumn>
-                    <GridColumn Field=@nameof(WzRowMarelliDto.ItemNumber) AllowEditing="false"
-                                TextAlign="TextAlign.Center" HeaderText="Numer Indeksu Meyle" Width="100"></GridColumn>
-                    <GridColumn Field=@nameof(WzRowMarelliDto.Quantity) AllowEditing="false" TextAlign="TextAlign.Center"
-                                HeaderText="Ilość w Dostawie" Width="80"></GridColumn>
                    <GridColumn Field=@nameof(WzRowMarelliDto.PalletNumber) AllowEditing="true"
                                TextAlign="TextAlign.Center" HeaderText="Nr Palety" Width="100"></GridColumn>
-                    <GridColumn Field=@nameof(WzRowMarelliDto.PartNumberSl) AllowEditing="true"
-                                TextAlign="TextAlign.Center"
-                                HeaderText="Nr Partii SL" Width="80"></GridColumn>
-                    <GridColumn Field=@nameof(WzRowMarelliDto.PartNumber) AllowEditing="true" TextAlign="TextAlign.Center"
-                                HeaderText="Nr Partii Meyle" Width="80"></GridColumn>
+                    <GridColumn Field=@nameof(WzRowMarelliDto.ItemNumber) AllowEditing="false"
+                                TextAlign="TextAlign.Center" HeaderText="Numer Indeksu Marelli"
+                                Width="70"></GridColumn>
+                    <GridColumn Field=@nameof(WzRowMarelliDto.EngineerNumber) AllowEditing="false" AllowFiltering="true"
+                                TextAlign="TextAlign.Center" HeaderText="Numer Inżynieryjny" Width="100"></GridColumn>
+                    <GridColumn Field=@nameof(WzRowMarelliDto.Quantity) AllowEditing="false" TextAlign="TextAlign.Center"
+                                HeaderText="Ilość w Dostawie" Width="80"></GridColumn>
+                    <GridColumn Field=@nameof(WzRowMarelliDto.OrderNumber) AllowEditing="true" TextAlign="TextAlign.Center"
+                                HeaderText="Nr Zamówienia" Width="80"></GridColumn>
+                    <GridColumn Field=@nameof(WzRowMarelliDto.WzNumber) AllowEditing="true" TextAlign="TextAlign.Center" 
+                                HeaderText="Nr WZ" Width="80"></GridColumn>
                </GridColumns>
                <GridEditSettings AllowDeleting="false"
                                  AllowAdding="false"
@@ -183,7 +180,7 @@
        if (firstRender)
        {
            _wzHeader = await WarehouseService.GetWzHeaderByIdAsync(WzHeader);
-            WzRowsMarelli = (await WarehouseService.GetWzRowsByWzHeaderId(WzHeader)).ToList();
+            WzRowsMarelli = (await WarehouseService.GetWzRowsMarelliByWzHeaderId(WzHeader)).ToList();

            TransactionModelsByPartNumber = await GetTransactionModels();

@@ -259,7 +256,7 @@
        if (materialTransactionByPartNumber != null)
        {
            SelectedRows.Clear();
-            FillFaPartNumberAndPalletNumber(materialTransactionByPartNumber, obj.Value.Trim());
+            FillPalletNumber(materialTransactionByPartNumber, obj.Value.Trim());
        }

        LastScannedValue = ScannedValue;
@@ -268,7 +265,7 @@
        _scanner.FocusAsync();
    }
    
-    private async Task FillFaPartNumberAndPalletNumber(TransactionModel materialTransactionByPartNumber, string scannedValue)
+    private async Task FillPalletNumber(TransactionModel materialTransactionByPartNumber, string scannedValue)
    {
        await _grid.ClearSelectionAsync();
        await _grid.Refresh();
@@ -367,9 +364,9 @@

    private async Task UpdateRows(IList<WzRowMarelliDto> changedRecords)
    {
-        await WarehouseService.UpdateWzRowsMeyleAsync(changedRecords);
+        await WarehouseService.UpdateWzRowsMarelliAsync(changedRecords);

-        WzRowsMarelli = (await WarehouseService.GetWzRowsByWzHeaderId(WzHeader)).ToList();
+        WzRowsMarelli = (await WarehouseService.GetWzRowsMarelliByWzHeaderId(WzHeader)).ToList();
        await InvokeAsync(StateHasChanged);
        await _grid.Refresh();
    }
@@ -388,7 +385,7 @@
        {
            if (currentSum == targetSum)
            {
-                result.Add(new List<WzRowMarelliDto>(currentCombination));
+                result.Add([..currentCombination]);
                return;
            }

--- a/OrdersManagement/Components/Pages/PackingLists/Marelli/MarelliPacklistSimple.razor
+++ b/OrdersManagement/Components/Pages/PackingLists/Marelli/MarelliPacklistSimple.razor
@@ -0,0 +1,316 @@
+@page "/Warehouse/Marelli/PackList/{WzHeader:guid}/Simple"
+@using OrdersManagement.Models
+@using Syncfusion.Blazor.Cards
+@using SytelineSaAppEfDataModel.Dtos
+@using Syncfusion.Blazor.Popups
+@using Syncfusion.Blazor.Inputs
+@using Syncfusion.Blazor.Buttons
+
+@inject NavigationManager NavigationManager
+@inject WarehouseService WarehouseService
+
+<div class="h-100 d-flex justify-content-center align-items-start">
+    <SfCard CssClass="shadow" style="width: 100%; max-width: 1200px;">
+        <CardHeader>
+            <h3 class="text-primary">Packing List</h3>
+        </CardHeader>
+        <CardContent>
+            <SfCard CssClass="shadow" style="width: 100%; max-width: 1200px;" Orientation="CardOrientation.Horizontal">
+                <CardContent>
+                    <SfButton CssClass="e-primary" IsPrimary="true" @onclick="ChangeView">Zmień widok</SfButton>
+                    <SfButton CssClass="e-primary" IsPrimary="true" @onclick="ExportXls">Generuj XLS i Wyślij</SfButton>
+                </CardContent>
+            </SfCard>
+            <SfCard CssClass="shadow" style="width: 100%; max-width: 1200px;">
+                <CardContent>
+                    <label for="textBox" class="form-label">Adresy Email do Wysyłki raportu:</label>
+                    <SfTextBox ID="textBox" Placeholder="Wprowadź adresy..." @bind-Value="@EmailAddresses"
+                               CssClass="e-outline"/>
+                </CardContent>
+            </SfCard>
+            <SfCard CssClass="shadow" style="width: 100%; max-width: 1200px;">
+                <CardContent>
+                    <label for="textBox" class="form-label">Numer WZ:</label>
+                    <SfTextBox ID="textBox" @bind-Value=@WzNumber CssClass="e-outline"/>
+                </CardContent>
+            </SfCard>
+            <SfCard CssClass="shadow" style="width: 100%; max-width: 1200px;">
+                <CardContent>
+                    <label for="textBox" class="form-label">Wprowadź numer palety:</label>
+                    <SfTextBox ID="palletNumber" Type="InputType.Number" @bind-Value="@PalletNumber"
+                               CssClass="e-outline"/>
+                    <label for="textBox" class="form-label">Zeskanowana wartość:</label>
+                    <SfTextBox ID="scannedValue" ValueChange="ScanValue" @bind-Value="ScannedValue"
+                               CssClass="e-outline" @ref="_scanner"/>
+                </CardContent>
+            </SfCard>
+            <SfCard CssClass="shadow" style="width: 100%; max-width: 1200px;">
+                <CardContent>
+                    <label for="textBox" class="form-label">Numer Indeksu FA:</label>
+                    <SfTextBox ID="itemNumber" @bind-Value="@ItemNumber"
+                               CssClass="e-outline" Readonly="true"/>
+                    <label for="textBox" class="form-label">Ilość w Dostawie:</label>
+                    <SfTextBox ID="qty" Type="InputType.Number" @bind-Value="@Qty"
+                               CssClass="e-outline" Readonly="true"/>
+                    <label for="textBox" class="form-label">Numer Palety:</label>
+                    <SfTextBox ID="palletNumberOutput" Type="InputType.Number" @bind-Value="@PalletNumberOutput"
+                               CssClass="e-outline" Readonly="true"/>
+                </CardContent>
+            </SfCard>
+        </CardContent>
+
+        <SfDialog Width="500px" Title="Informacja" IsModal="true" @bind-Visible="Visibility" AllowPrerender="true">
+            <DialogTemplates>
+                <Content>
+                    @if (_isValid)
+                    {
+                        <p>Packing List został wygenerowany i wysłany!</p>
+                    }
+                    else if (string.IsNullOrWhiteSpace(EmailAddresses))
+                    {
+                        <p>Błąd: Proszę wprowadzić przynajmniej jeden <b>ADRES EMAIL</b> do wysyłki raportu!</p>
+                    }
+                    else if (!_isValid)
+                    {
+                        <p>Błąd: Nie Wszystkie linie mają wypełniony <b>NUMER PALETY</b>.<br/>Packing List nie zostanie
+                            wygenerowany!</p>
+                    }
+                </Content>
+            </DialogTemplates>
+            <DialogButtons>
+                <DialogButton Content="OK" IsPrimary="true" OnClick="@HideModal"/>
+            </DialogButtons>
+        </SfDialog>
+
+        <SfDialog Width="500px" Title="Błąd" IsModal="true" @bind-Visible="VisibilityPalletNumber"
+                  AllowPrerender="true">
+            <DialogTemplates>
+                <Content>
+                    <p>Błąd skanowania! <b>Wybierz NUMER PALETY większy niż 0</b> (Aktualnie '@PalletNumber'):</p>
+                </Content>
+            </DialogTemplates>
+            <DialogButtons>
+                <DialogButton Content="OK" IsPrimary="true" OnClick="@HideModal"/>
+            </DialogButtons>
+        </SfDialog>
+
+        <CardFooter>
+            <small class="text-muted">FA Krosno Manager © @(DateTime.Now.Year)</small>
+        </CardFooter>
+    </SfCard>
+</div>
+
+@code {
+    [Parameter] public Guid WzHeader { get; set; }
+
+    private List<WzRowMarelliDto> WzRowsMarelli { get; set; } = new();
+    private IDictionary<string, List<TransactionModel>> TransactionModelsByPartNumber { get; set; } = new Dictionary<string, List<TransactionModel>>();
+    private List<WzRowMarelliDto> ChangedRecords = new();
+    private WzHeaderDto _wzHeader;
+    private SfTextBox _scanner;
+
+    private string ItemNumber { get; set; } = string.Empty;
+    private string Qty { get; set; } = "0";
+    private string PalletNumberOutput { get; set; } = "0";
+
+    private string WzNumber { get; set; } = string.Empty;
+
+    private WzRowMarelliDto? SelectedRow { get; set; }
+    private List<WzRowMarelliDto> SelectedRows { get; set; } = new();
+
+    private bool _isValid;
+
+    public bool Visibility { get; set; }
+    public bool VisibilityPalletNumber { get; set; }
+
+    private string? EmailAddresses { get; set; } = string.Empty;
+    private string PalletNumber { get; set; } = "0";
+
+    private string LastScannedValue { get; set; } = string.Empty;
+    private string ScannedValue { get; set; } = string.Empty;
+
+    private void HideModal()
+    {
+        VisibilityPalletNumber = false;
+        Visibility = false;
+
+        LastScannedValue = ScannedValue;
+        ScannedValue = string.Empty;
+
+        _scanner.FocusAsync();
+    }
+
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender)
+        {
+            _wzHeader = await WarehouseService.GetWzHeaderByIdAsync(WzHeader);
+            WzRowsMarelli = (await WarehouseService.GetWzRowsMarelliByWzHeaderId(WzHeader)).ToList();
+
+            TransactionModelsByPartNumber = await GetTransactionModels();
+
+            EmailAddresses = _wzHeader.EmailAddresses;
+
+            WzNumber = _wzHeader.WzNumbers ?? string.Empty;
+
+            await _scanner.FocusAsync();
+            StateHasChanged();
+        }
+    }
+
+    private async Task SaveChanges()
+    {
+        if (!string.IsNullOrWhiteSpace(EmailAddresses))
+        {
+            await WarehouseService.AddEmailsToWzHeaderAsync(WzHeader, EmailAddresses);
+        }
+
+        if (ChangedRecords.Any())
+        {
+            await UpdateRows(ChangedRecords);
+        }
+    }
+
+    private async Task ExportXls()
+    {
+        int count = WzRowsMarelli.Count(x => x.PalletNumber == null);
+
+        _isValid = count == 0;
+        _isValid = _isValid && !string.IsNullOrWhiteSpace(EmailAddresses);
+
+        if (_isValid)
+        {
+            await WarehouseService.AddEmailsToWzHeaderAsync(WzHeader, EmailAddresses);
+            await WarehouseService.GenerateXlsForMarelliAsync(WzHeader);
+        }
+
+        Visibility = true;
+    }
+
+    private void ScanValue(ChangedEventArgs obj)
+    {
+        if (string.IsNullOrWhiteSpace(obj.Value)) return;
+        if (int.Parse(PalletNumber) <= 0)
+        {
+            VisibilityPalletNumber = true;
+            return;
+        }
+
+        ScannedValue = obj.Value.Trim();
+
+        StateHasChanged();
+
+        TransactionModelsByPartNumber.TryGetValue(obj.Value.Trim(), out List<TransactionModel>? materialTransactionsByPartNumber);
+        TransactionModel? materialTransactionByPartNumber = materialTransactionsByPartNumber?.FirstOrDefault();
+
+        if (materialTransactionByPartNumber != null)
+        {
+            FillPalletNumber(materialTransactionByPartNumber, obj.Value.Trim());
+        }
+
+        LastScannedValue = ScannedValue;
+        ScannedValue = string.Empty;
+
+        _scanner.FocusAsync();
+    }
+
+    private async Task FillPalletNumber(TransactionModel materialTransactionByPartNumber, string scannedValue)
+    {
+        await InvokeAsync(StateHasChanged);
+
+        int palletNumber = int.Parse(PalletNumber);
+        int rowIndex = WzRowsMarelli.FindIndex(x => x.FaIndex == materialTransactionByPartNumber.ItemNumber && x.Quantity == materialTransactionByPartNumber.Quantity);
+
+        switch (rowIndex)
+        {
+            case -1:
+            {
+                SelectedRows = WzRowsMarelli.Where(x => x.FaIndex == materialTransactionByPartNumber.ItemNumber).ToList();
+
+                var validCombinations = FindCombinations(SelectedRows, (int?)materialTransactionByPartNumber.Quantity ?? 0);
+
+                foreach (var combination in validCombinations)
+                {
+                    foreach (var record in combination)
+                    {
+                        record.PalletNumber = palletNumber;
+                        ChangedRecords.Add(record);
+                    }
+                }
+
+                SelectedRows.Clear();
+                SelectedRows.AddRange(ChangedRecords);
+
+                SelectedRow = SelectedRows.FirstOrDefault();
+                
+                break;
+            }
+            default:
+            {
+                SelectedRow = WzRowsMarelli[rowIndex];
+                
+                SelectedRow.PalletNumber = palletNumber;
+
+                if (ChangedRecords.All(x => x.TransactionNumber != SelectedRow.TransactionNumber))
+                {
+                    ChangedRecords.Add(SelectedRow);
+                }
+
+                break;
+            }
+        }
+
+        await SaveChanges();
+        ChangedRecords.Clear();
+        
+        await InvokeAsync(StateHasChanged);
+        
+        await _scanner.FocusAsync();
+    }
+
+    private async Task<IDictionary<string, List<TransactionModel>>> GetTransactionModels()
+    {
+        return await WarehouseService.GetTransactionsModels();
+    }
+
+    private async Task UpdateRows(IList<WzRowMarelliDto> changedRecords)
+    {
+        await WarehouseService.UpdateWzRowsMarelliAsync(changedRecords);
+
+        WzRowsMarelli = (await WarehouseService.GetWzRowsMarelliByWzHeaderId(WzHeader)).ToList();
+        await InvokeAsync(StateHasChanged);
+    }
+
+    private List<List<WzRowMarelliDto>> FindCombinations(List<WzRowMarelliDto> records, int targetSum)
+    {
+        var result = new List<List<WzRowMarelliDto>>();
+        var currentCombination = new List<WzRowMarelliDto>();
+
+        void Backtrack(int start, int currentSum)
+        {
+            if (currentSum == targetSum)
+            {
+                result.Add(new List<WzRowMarelliDto>(currentCombination));
+                return;
+            }
+
+            for (int i = start; i < records.Count; i++)
+            {
+                if (currentSum + records[i].Quantity <= targetSum)
+                {
+                    currentCombination.Add(records[i]);
+                    Backtrack(i + 1, currentSum + records[i].Quantity ?? 0);
+                    currentCombination.RemoveAt(currentCombination.Count - 1);
+                }
+            }
+        }
+
+        Backtrack(0, 0);
+        return result;
+    }
+
+    private void ChangeView()
+    {
+        NavigationManager.NavigateTo($"/Warehouse/Marelli/PackList/{WzHeader}");
+    }
+}
--- a/OrdersManagement/Components/Pages/PackingLists/Meyle/MeylePackList.razor
+++ b/OrdersManagement/Components/Pages/PackingLists/Meyle/MeylePackList.razor
@@ -227,7 +227,7 @@
        if (firstRender)
        {
            _wzHeader = await WarehouseService.GetWzHeaderByIdAsync(WzHeader);
-            WzRowsMeyle = (await WarehouseService.GetWzRowsByWzHeaderId(WzHeader)).ToList();
+            WzRowsMeyle = (await WarehouseService.GetWzRowsMeyleByWzHeaderId(WzHeader)).ToList();

            TransactionModelsByPartNumber = await GetTransactionModels();

@@ -479,7 +479,7 @@
    {
        await WarehouseService.UpdateWzRowsMeyleAsync(changedRecords);

-        WzRowsMeyle = (await WarehouseService.GetWzRowsByWzHeaderId(WzHeader)).ToList();
+        WzRowsMeyle = (await WarehouseService.GetWzRowsMeyleByWzHeaderId(WzHeader)).ToList();
        await InvokeAsync(StateHasChanged);
        await _grid.Refresh();
    }
--- a/OrdersManagement/Components/Pages/PackingLists/Meyle/MeylePacklistSimple.razor
+++ b/OrdersManagement/Components/Pages/PackingLists/Meyle/MeylePacklistSimple.razor
@@ -176,7 +176,7 @@
        if (firstRender)
        {
            _wzHeader = await WarehouseService.GetWzHeaderByIdAsync(WzHeader);
-            WzRowsMeyle = (await WarehouseService.GetWzRowsByWzHeaderId(WzHeader)).ToList();
+            WzRowsMeyle = (await WarehouseService.GetWzRowsMeyleByWzHeaderId(WzHeader)).ToList();

            TransactionModelsByPartNumber = await GetTransactionModels();

@@ -385,7 +385,7 @@
    {
        await WarehouseService.UpdateWzRowsMeyleAsync(changedRecords);

-        WzRowsMeyle = (await WarehouseService.GetWzRowsByWzHeaderId(WzHeader)).ToList();
+        WzRowsMeyle = (await WarehouseService.GetWzRowsMeyleByWzHeaderId(WzHeader)).ToList();
        await InvokeAsync(StateHasChanged);
    }

@@ -419,6 +419,6 @@

    private void ChangeView()
    {
-        NavigationManager.NavigateTo($"/Warehouse/PackList/{WzHeader}");
+        NavigationManager.NavigateTo($"/Warehouse/Meyle/PackList/{WzHeader}");
    }
 }