From 341abbfcc0a54f4ea0778959df55fcab43ac9a09 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Sat, 10 Feb 2024 12:32:38 +0100 Subject: [PATCH] Update generali gestione ordine --- SHERPA.AD/SHERPA.AD.csproj | 2 +- SHERPA.BBM.CORE/DbModels/OrderModel.cs | 6 ++-- SHERPA.BBM.UI/Components/DocMovList.razor.cs | 6 ++++ SHERPA.BBM.UI/Data/BBM_EFService.cs | 31 +++++++++++++++++- SHERPA.BBM.UI/Pages/Baskets.razor.cs | 4 ++- SHERPA.BBM.UI/Pages/DocMover.razor.cs | 22 ++++++++++--- SHERPA.BBM.UI/Pages/RecOrd2Fatt.razor | 2 +- SHERPA.BBM.UI/Pages/RecOrd2Fatt.razor.cs | 9 ++++-- SHERPA.BBM.UI/Pages/Resources.razor | 2 +- SHERPA.BBM.UI/Pages/Resources.razor.cs | 32 ++++++++++++++----- SHERPA.BBM.UI/Pages/Trend.razor | 7 +++- SHERPA.BBM.UI/SHERPA.BBM.UI.csproj | 2 +- SHERPA.BBM.UI/Shared/NavMenu.razor | 10 +++++- SHERPA.BBM.UI/Shared/NavMenu.razor.css | 2 +- SHERPA.BBM.UI/Shared/NavMenu.razor.less | 2 +- SHERPA.BBM.UI/Shared/NavMenu.razor.min.css | 2 +- SHERPA.BBM.UI/compilerconfig.json | 8 ++--- .../wwwroot/lib/Chart.js/chart.es5.js | 12 +++++++ .../wwwroot/lib/Chart.js/chart.es5.min.js | 14 ++++++++ 19 files changed, 143 insertions(+), 32 deletions(-) create mode 100644 SHERPA.BBM.UI/wwwroot/lib/Chart.js/chart.es5.js create mode 100644 SHERPA.BBM.UI/wwwroot/lib/Chart.js/chart.es5.min.js diff --git a/SHERPA.AD/SHERPA.AD.csproj b/SHERPA.AD/SHERPA.AD.csproj index 99c2a46..4cbd743 100644 --- a/SHERPA.AD/SHERPA.AD.csproj +++ b/SHERPA.AD/SHERPA.AD.csproj @@ -4,7 +4,7 @@ net6.0 enable enable - 2.0.2402.0217 + 2.0.2402.1012 Egalware 2021+ diff --git a/SHERPA.BBM.CORE/DbModels/OrderModel.cs b/SHERPA.BBM.CORE/DbModels/OrderModel.cs index 6ad24a1..3b700d9 100644 --- a/SHERPA.BBM.CORE/DbModels/OrderModel.cs +++ b/SHERPA.BBM.CORE/DbModels/OrderModel.cs @@ -78,7 +78,7 @@ namespace SHERPA.BBM.CORE.DbModels { answ = (decimal)ResNav.Sum(r => r.FinalPrice); } - return answ; + return Math.Round(answ, 2); } } @@ -99,13 +99,13 @@ namespace SHERPA.BBM.CORE.DbModels answ = B2ONav.Sum(f => f.Amount); //answ = B2ONav.Sum(f => f.BillNav.Amount); } - return answ; + return Math.Round(answ, 2); } } [NotMapped] public decimal AmountOpen { - get => AmountReq - BillTot; + get => Math.Round(AmountReq - BillTot, 2); } [NotMapped] diff --git a/SHERPA.BBM.UI/Components/DocMovList.razor.cs b/SHERPA.BBM.UI/Components/DocMovList.razor.cs index b2c59d4..cd8a801 100644 --- a/SHERPA.BBM.UI/Components/DocMovList.razor.cs +++ b/SHERPA.BBM.UI/Components/DocMovList.razor.cs @@ -81,6 +81,12 @@ namespace SHERPA.BBM.UI.Components #endregion Protected Fields + #region Protected Properties + + + + #endregion Protected Properties + #region Protected Methods protected async Task ForceReload(int newNum) diff --git a/SHERPA.BBM.UI/Data/BBM_EFService.cs b/SHERPA.BBM.UI/Data/BBM_EFService.cs index c3997aa..800ef16 100644 --- a/SHERPA.BBM.UI/Data/BBM_EFService.cs +++ b/SHERPA.BBM.UI/Data/BBM_EFService.cs @@ -203,6 +203,8 @@ namespace SHERPA.BBM.UI.Data { dbResult = dbResult.Where(x => x.Descript.Contains(SearchVal, StringComparison.InvariantCultureIgnoreCase)).ToList(); } + // riordino x codice... + dbResult = dbResult.OrderByDescending(x => x.CodBasket).ToList(); stopWatch.Stop(); LogDebug($"BasketsGetAsync | {source} ", stopWatch.Elapsed); return Task.FromResult(dbResult); @@ -802,7 +804,7 @@ namespace SHERPA.BBM.UI.Data dbController.CustomerUpdate(currItem); await FlushRedisCache(); } - catch(Exception exc) + catch (Exception exc) { Log.Error($"Eccezione in CustomerUpdate{Environment.NewLine}{exc}"); } @@ -922,6 +924,12 @@ namespace SHERPA.BBM.UI.Data return dbResult; } + /// + /// sposta documento nella negoziazione richiesta + /// + /// + /// + /// public async Task DocsMoveNegot(int DocId, int NegotiationId) { bool answ = false; @@ -1373,6 +1381,27 @@ namespace SHERPA.BBM.UI.Data return Task.FromResult(dbController.NegotGetByKey(NegotId)); } + /// + /// Sposta negoziazione nel basket indicato + /// + /// + /// + /// + public async Task NegotiationMoveBasket(int NegotiationId, int BasketId) + { + bool answ = false; + try + { + answ = dbController.NegotiationMoveBasket(NegotiationId, BasketId); + await FlushRedisCache(); + } + catch (Exception exc) + { + LogException("Eccezione durante NegotiationMoveBasket", exc); + } + return answ; + } + public Task> NegotiationsGetAllAsync() { return Task.FromResult(dbController.NegotGetAllDesc()); diff --git a/SHERPA.BBM.UI/Pages/Baskets.razor.cs b/SHERPA.BBM.UI/Pages/Baskets.razor.cs index 905d641..e61e6ec 100644 --- a/SHERPA.BBM.UI/Pages/Baskets.razor.cs +++ b/SHERPA.BBM.UI/Pages/Baskets.razor.cs @@ -124,6 +124,7 @@ namespace SHERPA.BBM.UI.Pages CodBasket = newCode, DataIns = DateTime.Now, Descript = "New Basket", + Anno = DateTime.Today.Year, IsActive = true }; currItem = newRecord; @@ -450,7 +451,8 @@ namespace SHERPA.BBM.UI.Pages { // init variabili var filtSelData = new BBM_SelectData(); - filtSelData.YearSel = 0; + filtSelData.YearSel = currRecord.Anno; + //filtSelData.YearSel = 0; filtSelData.CompanyId = currRecord.CompanyId; // salvo codice company... var currComp = CompanyList.Where(x => x.CompanyId == currRecord.CompanyId).FirstOrDefault(); diff --git a/SHERPA.BBM.UI/Pages/DocMover.razor.cs b/SHERPA.BBM.UI/Pages/DocMover.razor.cs index 6d394c4..0e703e5 100644 --- a/SHERPA.BBM.UI/Pages/DocMover.razor.cs +++ b/SHERPA.BBM.UI/Pages/DocMover.razor.cs @@ -34,6 +34,21 @@ namespace SHERPA.BBM.UI.Pages protected int SelNegIdDx { get; set; } protected int SelNegIdSx { get; set; } + protected int YearSel + { + get => yearSel; + set + { + if (yearSel != value) + { + yearSel = value; + // condiziono visualizzazione... + var pUpd = Task.Run(async () => await ReloadAllData()); + pUpd.Wait(); + } + } + } + #endregion Protected Properties #region Protected Methods @@ -69,14 +84,14 @@ namespace SHERPA.BBM.UI.Pages protected async Task ReloadDataDx() { CustomersList = await BBMService.CustomersGetAll(""); - BasketListDx = await BBMService.BasketsGetAsync(1, 0); + BasketListDx = await BBMService.BasketsGetAsync(1, YearSel); NegotiationListDx = await BBMService.NegotiationsGetAsync(YearSel, 1, SelCustomerIdDx, SelBasketIdDx, ""); } protected async Task ReloadDataSx() { CustomersList = await BBMService.CustomersGetAll(""); - BasketListSx = await BBMService.BasketsGetAsync(1, 0); + BasketListSx = await BBMService.BasketsGetAsync(1, YearSel); NegotiationListSx = await BBMService.NegotiationsGetAsync(YearSel, 1, SelCustomerIdSx, SelBasketIdSx, ""); } @@ -93,8 +108,7 @@ namespace SHERPA.BBM.UI.Pages private List NegotiationListDx = new List(); private List NegotiationListSx = new List(); - - private int YearSel = 0; + private int yearSel = 0; private List yearsList = new List(); diff --git a/SHERPA.BBM.UI/Pages/RecOrd2Fatt.razor b/SHERPA.BBM.UI/Pages/RecOrd2Fatt.razor index 75c739c..78b32c5 100644 --- a/SHERPA.BBM.UI/Pages/RecOrd2Fatt.razor +++ b/SHERPA.BBM.UI/Pages/RecOrd2Fatt.razor @@ -9,7 +9,7 @@ else {
- +
diff --git a/SHERPA.BBM.UI/Pages/RecOrd2Fatt.razor.cs b/SHERPA.BBM.UI/Pages/RecOrd2Fatt.razor.cs index 4283104..fd42aa7 100644 --- a/SHERPA.BBM.UI/Pages/RecOrd2Fatt.razor.cs +++ b/SHERPA.BBM.UI/Pages/RecOrd2Fatt.razor.cs @@ -50,7 +50,8 @@ namespace SHERPA.BBM.UI.Pages // era intero pagato, ora prendo il valore del movimento // decimal pagato = (BillPaid == BillNetTot || BillPaid == BillAmountTot) ? BillPaid : 0; //decimal pagato = AccMovSel.Amount; - decimal pagato = AccMovSel.Paid; + //decimal pagato = AccMovSel.Paid; + decimal pagato = (BillPaid == BillNetTot || BillPaid == BillAmountTot) ? AccMovSel.Amount : AccMovSel.Paid; await BBMService.AccMovUpdateBill(AccMovSel.AccMovId, SelIdxBill, pagato); } MService.SearchVal = ""; @@ -175,7 +176,11 @@ namespace SHERPA.BBM.UI.Pages private bool LinkEnabled { - get => OrdAmountTot != 0 && ((OrdAmountTot == BillAmountTot || OrdAmountTot == BillNetTot) || (forceLink && (Math.Abs(OrdAmountTot) <= Math.Abs(BillNetTot)))); + get + { + bool answ = OrdAmountTot != 0 && ((OrdAmountTot == BillAmountTot || OrdAmountTot == BillNetTot) || (forceLink && (Math.Abs(OrdAmountTot) <= Math.Abs(BillNetTot)))); + return answ; + } } private decimal OrdAmountTot diff --git a/SHERPA.BBM.UI/Pages/Resources.razor b/SHERPA.BBM.UI/Pages/Resources.razor index 6f82bc8..f03d052 100644 --- a/SHERPA.BBM.UI/Pages/Resources.razor +++ b/SHERPA.BBM.UI/Pages/Resources.razor @@ -74,8 +74,8 @@ -   +
diff --git a/SHERPA.BBM.UI/Pages/Resources.razor.cs b/SHERPA.BBM.UI/Pages/Resources.razor.cs index 8ecb511..a128f6e 100644 --- a/SHERPA.BBM.UI/Pages/Resources.razor.cs +++ b/SHERPA.BBM.UI/Pages/Resources.razor.cs @@ -63,7 +63,7 @@ namespace SHERPA.BBM.UI.Pages if (currDoc != null) { // nuovo record risorsa - CORE.DbModels.ResourcesModel newRecord = new CORE.DbModels.ResourcesModel() + ResourcesModel newRecord = new ResourcesModel() { DocId = currDoc.DocId, ItemId = 0, @@ -77,7 +77,7 @@ namespace SHERPA.BBM.UI.Pages } } - protected async Task Delete(CORE.DbModels.ResourcesModel currRecord) + protected async Task Delete(ResourcesModel currRecord) { if (!await JSRuntime.InvokeAsync("confirm", $"Sicuro di voler eliminare il Documento '{currRecord.ResourceId}'?")) return; @@ -86,10 +86,26 @@ namespace SHERPA.BBM.UI.Pages await UpdateData(); } - protected void Edit(CORE.DbModels.ResourcesModel currRecord) + protected void Edit(ResourcesModel currRecord) { currItem = currRecord; } + protected void Clone(ResourcesModel currRecord) + { + int newOrd = SearchRecords != null ? SearchRecords.Count + 1 : 1; + currItem = new ResourcesModel() + { + DocId = currRecord.DocId, + ItemId = currRecord.ItemId, + Anno = currRecord.Anno, + Note = currRecord.Note, + QtyPrev = currRecord.QtyPrev, + QtyOff = currRecord.QtyOff, + UnitPriceOff = currRecord.UnitPriceOff, + Ordinal = newOrd + }; + } + protected async Task ForceReload(int newNum) { @@ -127,7 +143,7 @@ namespace SHERPA.BBM.UI.Pages return grandTot; } - protected async Task Move(CORE.DbModels.ResourcesModel currRecord, int move) + protected async Task Move(ResourcesModel currRecord, int move) { await BBMService.ResourceUpdateOrder(currRecord.ResourceId, move); await updateTable(); @@ -183,12 +199,12 @@ namespace SHERPA.BBM.UI.Pages #region Private Fields - private CORE.DbModels.DocsModel? currDoc = null; + private DocsModel? currDoc = null; - private CORE.DbModels.ResourcesModel? currItem = null; + private ResourcesModel? currItem = null; - private List ListRecords = new List(); - private List SearchRecords = new List(); + private List ListRecords = new List(); + private List SearchRecords = new List(); #endregion Private Fields diff --git a/SHERPA.BBM.UI/Pages/Trend.razor b/SHERPA.BBM.UI/Pages/Trend.razor index 3c086cd..58881e3 100644 --- a/SHERPA.BBM.UI/Pages/Trend.razor +++ b/SHERPA.BBM.UI/Pages/Trend.razor @@ -81,7 +81,12 @@ else
@item.Incassato.ToString("C2") -
@((item.Incassato / item.Fatturato).ToString("P1"))
+
+ @if (item.Fatturato > 0) + { + @((item.Incassato / item.Fatturato).ToString("P1")) + } +
diff --git a/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj b/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj index 0342d72..df39334 100644 --- a/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj +++ b/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj @@ -4,7 +4,7 @@ net6.0 60fcdaab-6c1e-4bec-9d88-f7727ef1c12c wwwroot\favicon.ico - 2.0.2402.0217 + 2.0.2402.1012 enable enable Egalware 2021+ diff --git a/SHERPA.BBM.UI/Shared/NavMenu.razor b/SHERPA.BBM.UI/Shared/NavMenu.razor index 14b4648..a5e793d 100644 --- a/SHERPA.BBM.UI/Shared/NavMenu.razor +++ b/SHERPA.BBM.UI/Shared/NavMenu.razor @@ -45,6 +45,14 @@
+