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

* Translate Descriptions

Browse Source 
* Added TranslatedStatus
* Renamed DTO
* Added SL Number to Column
This commit is contained in:
Piotr Kus
2025-01-30 06:07:10 +01:00
parent c39cd3a473
commit efdbe8c6be
4 changed files with 65 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,6 +83,9 @@
<GridColumn TItem="EdiCustomerOrderLineDto" HeaderText="Pozycja Klienta" PropertyName="CustomerItemNumber">
@context.CustomerItemNumber
</GridColumn>
<GridColumn TItem="EdiCustomerOrderLineDto" HeaderText="Opis" PropertyName="Description">
@context.Description
</GridColumn>
<GridColumn TItem="EdiCustomerOrderLineDto" HeaderText="Ilość" TextAlignment="Alignment.End" PropertyName="BlanketQty">
@context.BlanketQty
</GridColumn>
@@ -92,8 +95,8 @@
<GridColumn TItem="EdiCustomerOrderLineDto" HeaderText="Cena" PropertyName="ContPrice">
@context.ContPrice
</GridColumn>
<GridColumn TItem="EdiCustomerOrderLineDto" HeaderText="Status" PropertyName="Status">
@context.Status
<GridColumn TItem="EdiCustomerOrderLineDto" HeaderText="Status" PropertyName="TranslatedStatus">
@context.TranslatedStatus
</GridColumn>
</GridColumns>
</Grid>
@@ -107,28 +110,22 @@
<div class="col">
<SortableList TItem="EdiCustomerOrderLineDto" Data="_selectedEdiCustomerOrderLine">
<ItemTemplate>
<u>CustomerOrderNumber:</u>&emsp;<b>@context.CustomerOrderNumber</b><br />
<u>CustomerOrderLine:</u>&emsp;<b>@context.CustomerOrderLine</b><br />
<u>Item:</u>&emsp;<b>@context.Item</b><br />
<u>CustomerItemNumber:</u>&emsp;<b>@context.CustomerItemNumber</b><br />
<u>BlanketQty:</u>&emsp;<b>@(context.BlanketQty?.ToString("F2") ?? "N/A")</b><br />
<u>EffectiveDate:</u>&emsp;<b>@(context.EffectiveDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")</b><br />
<u>ExpirationDate:</u>&emsp;<b>@(context.ExpirationDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")</b><br />
<u>ContPrice:</u>&emsp;<b>@(context.ContPrice?.ToString("F2") ?? "N/A")</b><br />
<u>Status:</u>&emsp;<b>@context.Status</b><br />
<u>Uom:</u>&emsp;<b>@context.Uom</b><br />
<u>Numer zamówienia EDI:</u>&emsp;<b>@context.CustomerOrderNumber</b><br />
<u>Linia:</u>&emsp;<b>@context.CustomerOrderLine</b><br />
<u>Pozycja:</u>&emsp;<b>@context.Item</b><br />
<u>Pozycja Klienta:</u>&emsp;<b>@context.CustomerItemNumber</b><br />
<u>Opis:</u>&emsp;<b>@context.Description</b><br />
<u>Łączna Ilość:</u>&emsp;<b>@(context.BlanketQty?.ToString("F2") ?? "N/A")</b><br />
<u>Status:</u>&emsp;<b>@context.TranslatedStatus</b><br />
</ItemTemplate>
</SortableList>
</div>
<div class="col">
<SortableList TItem="EdiCustomerOrderLineDto" Data="_selectedEdiCustomerOrderLine">
<ItemTemplate>
<u>BlanketQtyReleased:</u>&emsp;<b>@(context.BlanketQtyReleased?.ToString("F2") ?? "N/A")</b><br />
<u>ContPriceReleased:</u>&emsp;<b>@(context.ContPriceReleased?.ToString("F2") ?? "N/A")</b><br />
<u>QtySent:</u>&emsp;<b>@(context.QtySent?.ToString("F2") ?? "N/A")</b><br />
<u>RecordDate:</u>&emsp;<b>@context.RecordDate.ToString("yyyy-MM-dd HH:mm:ss")</b><br />
<u>Description:</u>&emsp;<b>@context.Description</b><br />
<u>CreateDate:</u>&emsp;<b>@context.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")</b><br />
<u>Cena:</u>&emsp;<b>@(context.ContPrice?.ToString("F2") ?? "N/A")</b><br />
<u>Ważne Od:</u>&emsp;<b>@(context.EffectiveDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")</b><br />
<u>J/M:</u>&emsp;<b>@context.Uom</b><br />
<u>BoxType:</u>&emsp;<b>@context.BoxType</b><br/>
<u>Address:</u>&emsp;<b>@context.Address</b><br/>
<u>FinalDestination:</u>&emsp;<b>@context.FinalDestination</b><br/>
@@ -147,32 +144,32 @@
AllowFiltering="true"
Responsive="true"
AllowPaging="true"
PageSize="20"
PageSize="10"
AllowSelection="true"
AllowRowClick="true"
SelectionMode="GridSelectionMode.Single"
SelectedItemsChanged="SelectedEdiCustomerOrderLineItemChanged">
<GridColumns>
<GridColumn TItem="EdiCustomerOrderLineItemDto" HeaderText="Id" PropertyName="Id">
<GridColumn TItem="EdiCustomerOrderLineItemDto" HeaderText="Linia" PropertyName="CustomerOrderLine">
@context.CustomerOrderLine
</GridColumn>
<GridColumn TItem="EdiCustomerOrderLineItemDto" HeaderText="Zwolnienie" PropertyName="CustomerOrderRelease">
@context.CustomerOrderRelease
</GridColumn>
<GridColumn TItem="EdiCustomerOrderLineItemDto" HeaderText="Quantity Ordered" TextAlignment="Alignment.End" PropertyName="Quantity Ordered">
<GridColumn TItem="EdiCustomerOrderLineItemDto" HeaderText="Pozycja" PropertyName="Item">
@context.Item
</GridColumn>
<GridColumn TItem="EdiCustomerOrderLineItemDto" HeaderText="Pozycja" PropertyName="CustomerItem">
@context.CustomerItem
</GridColumn>
<GridColumn TItem="EdiCustomerOrderLineItemDto" HeaderText="Łączna Ilość" TextAlignment="Alignment.End" PropertyName="QtyOrdered">
@context.QtyOrdered
</GridColumn>
<GridColumn TItem="EdiCustomerOrderLineItemDto" HeaderText="Due Date" PropertyName="Due Date">
<GridColumn TItem="EdiCustomerOrderLineItemDto" HeaderText="Data Wykonania" PropertyName="DueDate">
@context.DueDate?.ToString("yyyy-MM-dd")
</GridColumn>
<GridColumn TItem="EdiCustomerOrderLineItemDto" HeaderText="RoutingCode" PropertyName="RoutingCode">
@context.RoutingCode
</GridColumn>
<GridColumn TItem="EdiCustomerOrderLineItemDto" HeaderText="PalletCode" PropertyName="PalletCode">
@context.PalletCode
</GridColumn>
<GridColumn TItem="EdiCustomerOrderLineItemDto" HeaderText="UnloadingPoint" PropertyName="UnloadingPoint">
@context.UnloadingPoint
</GridColumn>
<GridColumn TItem="EdiCustomerOrderLineItemDto" HeaderText="DestinationPoint" PropertyName="DestinationPoint">
@context.DestinationPoint
<GridColumn TItem="EdiCustomerOrderLineItemDto" HeaderText="Status" PropertyName="TranslatedStatus">
@context.TranslatedStatus
</GridColumn>
</GridColumns>
</Grid>
@@ -186,32 +183,28 @@
<div class="col">
<SortableList TItem="EdiCustomerOrderLineItemDto" Data="_selectedEdiCustomerOrderLineItem">
<ItemTemplate>
<u>ReceivedDate:</u>&emsp;<b>@(context.ReceivedDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")</b><br />
<u>CustomerOrderNumber:</u>&emsp;<b>@context.CustomerOrderNumber</b><br />
<u>CustomerOrderLine:</u>&emsp;<b>@context.CustomerOrderLine</b><br />
<u>CustomerOrderRelease:</u>&emsp;<b>@context.CustomerOrderRelease</b><br />
<u>Item:</u>&emsp;<b>@context.Item</b><br />
<u>CustomerItem:</u>&emsp;<b>@context.CustomerItem</b><br />
<u>QtyOrdered:</u>&emsp;<b>@(context.QtyOrdered?.ToString("F2") ?? "N/A")</b><br />
<u>QtyReady:</u>&emsp;<b>@(context.QtyReady?.ToString("F2") ?? "N/A")</b><br />
<u>Cost:</u>&emsp;<b>@(context.Cost?.ToString("F2") ?? "N/A")</b><br />
<u>Price:</u>&emsp;<b>@(context.Price?.ToString("F2") ?? "N/A")</b><br />
<u>DueDate:</u>&emsp;<b>@(context.DueDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")</b><br />
<u>ReleaseDate:</u>&emsp;<b>@(context.ReleaseDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")</b><br />
<u>Warehouse:</u>&emsp;<b>@context.Warehouse</b><br />
<u>Data Otrzymania:</u>&emsp;<b>@(context.ReceivedDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")</b><br />
<u>Numer Zamówienia:</u>&emsp;<b>@context.CustomerOrderNumber</b><br />
<u>Linia:</u>&emsp;<b>@context.CustomerOrderLine</b><br />
<u>Zwolnienie:</u>&emsp;<b>@context.CustomerOrderRelease</b><br />
<u>Pozycja:</u>&emsp;<b>@context.Item</b><br />
<u>Pozycja Klienta:</u>&emsp;<b>@context.CustomerItem</b><br />
<u>Łączna Ilość Sztuk:</u>&emsp;<b>@(context.QtyOrdered?.ToString("F2") ?? "N/A")</b><br />
<u>Cena:</u>&emsp;<b>@(context.Price?.ToString("F2") ?? "N/A")</b><br />
<u>Data Wykonania:</u>&emsp;<b>@(context.DueDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")</b><br />
<u>Data Rejestracji:</u>&emsp;<b>@(context.ReleaseDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")</b><br />
<u>Magazyn:</u>&emsp;<b>@context.Warehouse</b><br />
</ItemTemplate>
</SortableList>
</div>
<div class="col">
<SortableList TItem="EdiCustomerOrderLineItemDto" Data="_selectedEdiCustomerOrderLineItem">
<ItemTemplate>
<u>TaxCodeOne:</u>&emsp;<b>@context.TaxCodeOne</b><br />
<u>Uom:</u>&emsp;<b>@context.Uom</b><br />
<u>QtyOrderedReleased:</u>&emsp;<b>@(context.QtyOrderedReleased?.ToString("F2") ?? "N/A")</b><br />
<u>PriceReleased:</u>&emsp;<b>@(context.PriceReleased?.ToString("F2") ?? "N/A")</b><br />
<u>CustomerOrderCustomerNumber:</u>&emsp;<b>@context.CustomerOrderCustomerNumber</b><br />
<u>Description:</u>&emsp;<b>@context.Description</b><br />
<u>CreateDate:</u>&emsp;<b>@context.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")</b><br />
<u>Kod VAT:</u>&emsp;<b>@context.TaxCodeOne</b><br />
<u>J/M:</u>&emsp;<b>@context.Uom</b><br />
<u>Numer Klienta:</u>&emsp;<b>@context.CustomerOrderCustomerNumber</b><br />
<u>Opis:</u>&emsp;<b>@context.Description</b><br />
<u>Status:</u>&emsp;<b>@context.TranslatedStatus</b><br />
<u>RoutingCode:</u>&emsp;<b>@context.RoutingCode</b><br />
<u>DeliveryCallNumber:</u>&emsp;<b>@context.DeliveryCallNumber</b><br />
<u>UnloadingPoint:</u>&emsp;<b>@context.UnloadingPoint</b><br />
@@ -229,12 +222,11 @@
public string CustomerOrderId { get; set; } = string.Empty;
List<EdiCustomerOrderDto?>? _ediCustomerOrder;
List<EdiCustomerOrderTranslateDto?> _ediCustomerOrderTranslate = new();
List<EdiCustomerOrderLineDto> _ediCustomerOrderLines = new();
List<EdiCustomerOrderLineItemDto> _ediCustomerOrderLineItems = new();
List<EdiCustomerOrderLineDto> _ediCustomerOrderLines = [];
List<EdiCustomerOrderLineItemDto> _ediCustomerOrderLineItems = [];
List<EdiCustomerOrderLineDto?> _selectedEdiCustomerOrderLine = new();
List<EdiCustomerOrderLineItemDto?> _selectedEdiCustomerOrderLineItem = new();
List<EdiCustomerOrderLineDto?> _selectedEdiCustomerOrderLine = [];
List<EdiCustomerOrderLineItemDto?> _selectedEdiCustomerOrderLineItem = [];
Grid<EdiCustomerOrderLineDto>? _ediCustomerOrderLinesGrid;
Grid<EdiCustomerOrderLineItemDto>? _ediCustomerOrderLineItemsGrid;
@@ -246,21 +238,20 @@
{
EdiCustomerOrderDto? ediCustomerOrder = await EdiCustomerOrderService.GetEdiCustomerOrderAsync(CustomerOrderId);
_ediCustomerOrder = new List<EdiCustomerOrderDto?> { ediCustomerOrder };
_ediCustomerOrderLines = ediCustomerOrder?.EdiCustomerOrderLines.ToList() ?? new List<EdiCustomerOrderLineDto>();
_ediCustomerOrderTranslate = new List<EdiCustomerOrderTranslateDto?> { ediCustomerOrder?.EdiCustomerOrderTranslates.MaxBy(x => x.CreatedDate) };
_ediCustomerOrder = [ediCustomerOrder];
_ediCustomerOrderLines = ediCustomerOrder?.EdiCustomerOrderLines.ToList() ?? [];
}
private void SelectedEdiCustomerOrderLineChanged(HashSet<EdiCustomerOrderLineDto> obj)
{
_isVisibleEdiCustomerOrderLine = obj.Any();
_selectedEdiCustomerOrderLine = new List<EdiCustomerOrderLineDto?> { obj.FirstOrDefault() };
_ediCustomerOrderLineItems = obj.FirstOrDefault()?.EdiCustomerOrderLineItems.ToList() ?? new List<EdiCustomerOrderLineItemDto>();
_selectedEdiCustomerOrderLine = [obj.FirstOrDefault()];
_ediCustomerOrderLineItems = obj.FirstOrDefault()?.EdiCustomerOrderLineItems.ToList() ?? [];
}
private void SelectedEdiCustomerOrderLineItemChanged(HashSet<EdiCustomerOrderLineItemDto> obj)
{
_isVisibleEdiCustomerOrderLineItem = obj.Any();
_selectedEdiCustomerOrderLineItem = new List<EdiCustomerOrderLineItemDto?> { obj.FirstOrDefault() };
_selectedEdiCustomerOrderLineItem = [obj.FirstOrDefault()];
}
}

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

@@ -60,6 +60,9 @@
<GridColumn TItem="EdiCustomerOrderDto" HeaderText="Status" PropertyName="TranslatedStatus">
@context.TranslatedStatus
</GridColumn>
<GridColumn TItem="EdiCustomerOrderDto" HeaderText="Zamówienie SL" PropertyName="SlOrderNumber">
@context.SlOrderNumber
</GridColumn>
</GridColumns>
</Grid>
</div>

1
SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderDto.cs
View File

@@ -103,6 +103,7 @@ namespace SytelineSaAppEfDataModel.Dtos
public string BuyerCode { get; set; }
public string TranslatedStatus => TranslateStatus(Status);
public string? SlOrderNumber => EdiCustomerOrderTranslates.MaxBy(x => x.CreatedDate)?.CoCoNum;
public IEnumerable<EdiCustomerOrderLineDto> EdiCustomerOrderLines { get; set; } = new List<EdiCustomerOrderLineDto>();
public IEnumerable<EdiCustomerOrderTranslateDto> EdiCustomerOrderTranslates { get; set; } = new List<EdiCustomerOrderTranslateDto>();

4
SytelineSaAppEfDataModel/Dtos/EdiCustomerLineItemDto.cs → SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderLineItemDto.cs
View File

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace SytelineSaAppEfDataModel.Dtos
{
public class EdiCustomerOrderLineItemDto
public class EdiCustomerOrderLineItemDto : DtoBase
{
public string TransactionCode { get; set; }
public DateTime? ReceivedDate { get; set; }
@@ -107,5 +107,7 @@ namespace SytelineSaAppEfDataModel.Dtos
public string NewStatus { get; set; }
public string PalletCode { get; set; }
public string PalletNumber { get; set; }
public string TranslatedStatus => TranslateStatus(Status);
}
}