From efdbe8c6bec61d8965caf5c10fd8501d7c917689 Mon Sep 17 00:00:00 2001 From: Piotr Kus Date: Thu, 30 Jan 2025 06:07:10 +0100 Subject: [PATCH] * Translate Descriptions * Added TranslatedStatus * Renamed DTO * Added SL Number to Column --- .../Components/Pages/EdiCustomerOrder.razor | 125 ++++++++---------- .../Components/Pages/EdiCustomerOrders.razor | 3 + .../Dtos/EdiCustomerOrderDto.cs | 1 + ...mDto.cs => EdiCustomerOrderLineItemDto.cs} | 4 +- 4 files changed, 65 insertions(+), 68 deletions(-) rename SytelineSaAppEfDataModel/Dtos/{EdiCustomerLineItemDto.cs => EdiCustomerOrderLineItemDto.cs} (97%) diff --git a/OrdersManagement/Components/Pages/EdiCustomerOrder.razor b/OrdersManagement/Components/Pages/EdiCustomerOrder.razor index 2a885f0..4df30c8 100644 --- a/OrdersManagement/Components/Pages/EdiCustomerOrder.razor +++ b/OrdersManagement/Components/Pages/EdiCustomerOrder.razor @@ -83,6 +83,9 @@ @context.CustomerItemNumber + + @context.Description + @context.BlanketQty @@ -92,8 +95,8 @@ @context.ContPrice - - @context.Status + + @context.TranslatedStatus @@ -107,31 +110,25 @@
- CustomerOrderNumber: @context.CustomerOrderNumber
- CustomerOrderLine: @context.CustomerOrderLine
- Item: @context.Item
- CustomerItemNumber: @context.CustomerItemNumber
- BlanketQty: @(context.BlanketQty?.ToString("F2") ?? "N/A")
- EffectiveDate: @(context.EffectiveDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")
- ExpirationDate: @(context.ExpirationDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")
- ContPrice: @(context.ContPrice?.ToString("F2") ?? "N/A")
- Status: @context.Status
- Uom: @context.Uom
+ Numer zamówienia EDI: @context.CustomerOrderNumber
+ Linia: @context.CustomerOrderLine
+ Pozycja: @context.Item
+ Pozycja Klienta: @context.CustomerItemNumber
+ Opis: @context.Description
+ Łączna Ilość: @(context.BlanketQty?.ToString("F2") ?? "N/A")
+ Status: @context.TranslatedStatus
- BlanketQtyReleased: @(context.BlanketQtyReleased?.ToString("F2") ?? "N/A")
- ContPriceReleased: @(context.ContPriceReleased?.ToString("F2") ?? "N/A")
- QtySent: @(context.QtySent?.ToString("F2") ?? "N/A")
- RecordDate: @context.RecordDate.ToString("yyyy-MM-dd HH:mm:ss")
- Description: @context.Description
- CreateDate: @context.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
- BoxType: @context.BoxType
- Address: @context.Address
- FinalDestination: @context.FinalDestination
+ Cena: @(context.ContPrice?.ToString("F2") ?? "N/A")
+ Ważne Od: @(context.EffectiveDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")
+ J/M: @context.Uom
+ BoxType: @context.BoxType
+ Address: @context.Address
+ FinalDestination: @context.FinalDestination
QtyPerBox: @(context.QtyPerBox?.ToString() ?? "N/A") @@ -147,32 +144,32 @@ AllowFiltering="true" Responsive="true" AllowPaging="true" - PageSize="20" + PageSize="10" AllowSelection="true" AllowRowClick="true" SelectionMode="GridSelectionMode.Single" SelectedItemsChanged="SelectedEdiCustomerOrderLineItemChanged"> - + + @context.CustomerOrderLine + + @context.CustomerOrderRelease - + + @context.Item + + + @context.CustomerItem + + @context.QtyOrdered - + @context.DueDate?.ToString("yyyy-MM-dd") - - @context.RoutingCode - - - @context.PalletCode - - - @context.UnloadingPoint - - - @context.DestinationPoint + + @context.TranslatedStatus @@ -186,32 +183,28 @@
- ReceivedDate: @(context.ReceivedDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")
- CustomerOrderNumber: @context.CustomerOrderNumber
- CustomerOrderLine: @context.CustomerOrderLine
- CustomerOrderRelease: @context.CustomerOrderRelease
- Item: @context.Item
- CustomerItem: @context.CustomerItem
- QtyOrdered: @(context.QtyOrdered?.ToString("F2") ?? "N/A")
- QtyReady: @(context.QtyReady?.ToString("F2") ?? "N/A")
- Cost: @(context.Cost?.ToString("F2") ?? "N/A")
- Price: @(context.Price?.ToString("F2") ?? "N/A")
- DueDate: @(context.DueDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")
- ReleaseDate: @(context.ReleaseDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")
- Warehouse: @context.Warehouse
+ Data Otrzymania: @(context.ReceivedDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")
+ Numer Zamówienia: @context.CustomerOrderNumber
+ Linia: @context.CustomerOrderLine
+ Zwolnienie: @context.CustomerOrderRelease
+ Pozycja: @context.Item
+ Pozycja Klienta: @context.CustomerItem
+ Łączna Ilość Sztuk: @(context.QtyOrdered?.ToString("F2") ?? "N/A")
+ Cena: @(context.Price?.ToString("F2") ?? "N/A")
+ Data Wykonania: @(context.DueDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")
+ Data Rejestracji: @(context.ReleaseDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")
+ Magazyn: @context.Warehouse
- TaxCodeOne: @context.TaxCodeOne
- Uom: @context.Uom
- QtyOrderedReleased: @(context.QtyOrderedReleased?.ToString("F2") ?? "N/A")
- PriceReleased: @(context.PriceReleased?.ToString("F2") ?? "N/A")
- CustomerOrderCustomerNumber: @context.CustomerOrderCustomerNumber
- Description: @context.Description
- CreateDate: @context.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
+ Kod VAT: @context.TaxCodeOne
+ J/M: @context.Uom
+ Numer Klienta: @context.CustomerOrderCustomerNumber
+ Opis: @context.Description
+ Status: @context.TranslatedStatus
RoutingCode: @context.RoutingCode
DeliveryCallNumber: @context.DeliveryCallNumber
UnloadingPoint: @context.UnloadingPoint
@@ -229,12 +222,11 @@ public string CustomerOrderId { get; set; } = string.Empty; List? _ediCustomerOrder; - List _ediCustomerOrderTranslate = new(); - List _ediCustomerOrderLines = new(); - List _ediCustomerOrderLineItems = new(); + List _ediCustomerOrderLines = []; + List _ediCustomerOrderLineItems = []; - List _selectedEdiCustomerOrderLine = new(); - List _selectedEdiCustomerOrderLineItem = new(); + List _selectedEdiCustomerOrderLine = []; + List _selectedEdiCustomerOrderLineItem = []; Grid? _ediCustomerOrderLinesGrid; Grid? _ediCustomerOrderLineItemsGrid; @@ -246,21 +238,20 @@ { EdiCustomerOrderDto? ediCustomerOrder = await EdiCustomerOrderService.GetEdiCustomerOrderAsync(CustomerOrderId); - _ediCustomerOrder = new List { ediCustomerOrder }; - _ediCustomerOrderLines = ediCustomerOrder?.EdiCustomerOrderLines.ToList() ?? new List(); - _ediCustomerOrderTranslate = new List { ediCustomerOrder?.EdiCustomerOrderTranslates.MaxBy(x => x.CreatedDate) }; + _ediCustomerOrder = [ediCustomerOrder]; + _ediCustomerOrderLines = ediCustomerOrder?.EdiCustomerOrderLines.ToList() ?? []; } private void SelectedEdiCustomerOrderLineChanged(HashSet obj) { _isVisibleEdiCustomerOrderLine = obj.Any(); - _selectedEdiCustomerOrderLine = new List { obj.FirstOrDefault() }; - _ediCustomerOrderLineItems = obj.FirstOrDefault()?.EdiCustomerOrderLineItems.ToList() ?? new List(); + _selectedEdiCustomerOrderLine = [obj.FirstOrDefault()]; + _ediCustomerOrderLineItems = obj.FirstOrDefault()?.EdiCustomerOrderLineItems.ToList() ?? []; } private void SelectedEdiCustomerOrderLineItemChanged(HashSet obj) { _isVisibleEdiCustomerOrderLineItem = obj.Any(); - _selectedEdiCustomerOrderLineItem = new List { obj.FirstOrDefault() }; + _selectedEdiCustomerOrderLineItem = [obj.FirstOrDefault()]; } } diff --git a/OrdersManagement/Components/Pages/EdiCustomerOrders.razor b/OrdersManagement/Components/Pages/EdiCustomerOrders.razor index 04d94f8..1eafc0e 100644 --- a/OrdersManagement/Components/Pages/EdiCustomerOrders.razor +++ b/OrdersManagement/Components/Pages/EdiCustomerOrders.razor @@ -60,6 +60,9 @@ @context.TranslatedStatus + + @context.SlOrderNumber +
diff --git a/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderDto.cs b/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderDto.cs index 61e9464..95237dd 100644 --- a/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderDto.cs +++ b/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderDto.cs @@ -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 EdiCustomerOrderLines { get; set; } = new List(); public IEnumerable EdiCustomerOrderTranslates { get; set; } = new List(); diff --git a/SytelineSaAppEfDataModel/Dtos/EdiCustomerLineItemDto.cs b/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderLineItemDto.cs similarity index 97% rename from SytelineSaAppEfDataModel/Dtos/EdiCustomerLineItemDto.cs rename to SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderLineItemDto.cs index e624f66..61f9640 100644 --- a/SytelineSaAppEfDataModel/Dtos/EdiCustomerLineItemDto.cs +++ b/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderLineItemDto.cs @@ -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); } }