From 3f09b6b5203309b368c868e04603da5fc0ef3366 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Fri, 17 Feb 2023 11:47:54 +0100 Subject: [PATCH] aggiunta conferma movimenti --- .../Components/DettagliArticolo.razor | 16 ++++++------ .../Components/DettagliArticolo.razor.cs | 7 +++++- StockMan.CORE/Components/Movimenti.razor | 2 +- StockMan.CORE/Components/StockGiacenze.razor | 4 +-- .../Components/StockGiacenze.razor.cs | 21 ++++++++++++---- StockMan.CORE/Data/StockDataService.cs | 13 ++++++++++ StockMan.CORE/Pages/ItemDetails.razor | 7 ++++-- StockMan.CORE/Pages/ItemDetails.razor.cs | 11 +++++++- StockMan.Data/Controllers/StoManController.cs | 25 ++++++++++++++++++- 9 files changed, 85 insertions(+), 21 deletions(-) diff --git a/StockMan.CORE/Components/DettagliArticolo.razor b/StockMan.CORE/Components/DettagliArticolo.razor index 070a8b7..7a8265d 100644 --- a/StockMan.CORE/Components/DettagliArticolo.razor +++ b/StockMan.CORE/Components/DettagliArticolo.razor @@ -2,7 +2,7 @@ { -
+
Dettagli articolo @@ -11,6 +11,13 @@ { } + else + { +
+ + +
+ }
@@ -64,12 +71,5 @@
- @if (isMod) - { -
- - -
- }
} \ No newline at end of file diff --git a/StockMan.CORE/Components/DettagliArticolo.razor.cs b/StockMan.CORE/Components/DettagliArticolo.razor.cs index 0c84944..684e43b 100644 --- a/StockMan.CORE/Components/DettagliArticolo.razor.cs +++ b/StockMan.CORE/Components/DettagliArticolo.razor.cs @@ -36,7 +36,8 @@ namespace StockMan.CORE.Components { await reloadData(); } - + [Parameter] + public EventCallback unitValue { get; set; } private async Task reloadData() { listItemsSearch = await SDService.ItemsGetByID(ItemID); @@ -44,6 +45,10 @@ namespace StockMan.CORE.Components { itemToDet = listItemsSearch.FirstOrDefault(); } + if (itemToDet != null) + { + await unitValue.InvokeAsync(itemToDet.CurrValue); + } itemFams = await SDService.ItemFamilyGetAll(); await Task.Delay(1); } diff --git a/StockMan.CORE/Components/Movimenti.razor b/StockMan.CORE/Components/Movimenti.razor index c0a374b..e8c8237 100644 --- a/StockMan.CORE/Components/Movimenti.razor +++ b/StockMan.CORE/Components/Movimenti.razor @@ -33,7 +33,7 @@ { - @flux.DtMov.Date + @flux.DtMov.Date.ToString("yyyy/MM/dd") @flux.LocationId diff --git a/StockMan.CORE/Components/StockGiacenze.razor b/StockMan.CORE/Components/StockGiacenze.razor index 4a7f7bf..1a91fd6 100644 --- a/StockMan.CORE/Components/StockGiacenze.razor +++ b/StockMan.CORE/Components/StockGiacenze.razor @@ -33,7 +33,7 @@
- +
@@ -143,7 +143,7 @@
- @if (!string.IsNullOrEmpty(fornitore) && !string.IsNullOrEmpty(pos)) + @if ((!string.IsNullOrEmpty(fornitore) || !string.IsNullOrEmpty(cliente)) && !string.IsNullOrEmpty(pos)) { } diff --git a/StockMan.CORE/Components/StockGiacenze.razor.cs b/StockMan.CORE/Components/StockGiacenze.razor.cs index 36e35cb..55d3a95 100644 --- a/StockMan.CORE/Components/StockGiacenze.razor.cs +++ b/StockMan.CORE/Components/StockGiacenze.razor.cs @@ -30,26 +30,38 @@ namespace StockMan.CORE.Components listLocation = await SDService.LocationGetAll(); } + + private async Task confermaMovimenti() + { + var done = await SDService.ConfermaMov(ItemID); + if (done) + { + NavManager.NavigateTo(NavManager.Uri, true); + } + } + private async Task saveCarico() { await Task.Delay(1); string movTipo = ""; string cliOrForn = ""; - + int qtaScarCar = 0; if (isCarico) { movTipo = "CAR"; cliOrForn = fornitore; + qtaScarCar = 0+qta; } else if (isScarico) { movTipo = "SCAR"; cliOrForn = cliente; + qtaScarCar = 0-qta; } else if (isRettifica) { - movTipo = "SCAR"; + movTipo = "RETT"; cliOrForn = cliente; } @@ -60,9 +72,8 @@ namespace StockMan.CORE.Components MovTypeId = movTipo, ExtLocationId = cliOrForn, DtMov = DateTime.Now.Date, - Qta = qta, + Qta = qtaScarCar, TotValue = importo, - UnitVal = (importo / qta), OperatorId = "ND", Note = note, CodDoc = documento, @@ -79,7 +90,7 @@ namespace StockMan.CORE.Components [Parameter] public int ItemID { get; set; } = 0; [Parameter] - public decimal valoreUnit { get; set; } = 0.0M; + public decimal valoreUnit { get; set; } = 0.0M; protected bool isCarico { get; set; } = false; protected bool isScarico { get; set; } = false; diff --git a/StockMan.CORE/Data/StockDataService.cs b/StockMan.CORE/Data/StockDataService.cs index a7287e4..ba671bd 100644 --- a/StockMan.CORE/Data/StockDataService.cs +++ b/StockMan.CORE/Data/StockDataService.cs @@ -318,6 +318,19 @@ namespace StockMan.CORE.Data return dbResult; } + public async Task ConfermaMov(int itemID) + { + Stopwatch stopWatch = new Stopwatch(); + stopWatch.Start(); + bool result = false; + string source = "DB"; + result = await dbController.ConfermaMov(itemID); + stopWatch.Stop(); + TimeSpan ts = stopWatch.Elapsed; + Log.Debug($"ConfermaMov Read from {source}: {ts.TotalMilliseconds}ms"); + return result; + } + /// /// Lista Articoli da ricerca /// diff --git a/StockMan.CORE/Pages/ItemDetails.razor b/StockMan.CORE/Pages/ItemDetails.razor index 73cb222..0e1a041 100644 --- a/StockMan.CORE/Pages/ItemDetails.razor +++ b/StockMan.CORE/Pages/ItemDetails.razor @@ -10,8 +10,11 @@
- +
- +} +else +{ +
Articolo non trovato!
} \ No newline at end of file diff --git a/StockMan.CORE/Pages/ItemDetails.razor.cs b/StockMan.CORE/Pages/ItemDetails.razor.cs index 510c98f..63e5ff0 100644 --- a/StockMan.CORE/Pages/ItemDetails.razor.cs +++ b/StockMan.CORE/Pages/ItemDetails.razor.cs @@ -50,7 +50,10 @@ namespace StockMan.CORE.Pages { itemToDet = listItemsSearch.FirstOrDefault(); } - + if(itemToDet != null) + { + valoreUnit = itemToDet.CurrValue; + } await Task.Delay(1); itemFlux = await SDService.ItemFluxGetById(itemToDet.Id); @@ -67,6 +70,7 @@ namespace StockMan.CORE.Pages isMod = true; } protected int ItemID { get; set; } = 0; + protected decimal valoreUnit { get; set; } = 0.00M; protected bool isMod { get; set; } = false; protected bool isCarico { get; set; } = false; protected bool isScarico { get; set; } = false; @@ -157,5 +161,10 @@ namespace StockMan.CORE.Pages get => _note; set => _note = value; } + + protected void UpdateCurrImportoUnit(decimal importoUnit) + { + valoreUnit = importoUnit; + } } } \ No newline at end of file diff --git a/StockMan.Data/Controllers/StoManController.cs b/StockMan.Data/Controllers/StoManController.cs index 48cb11c..27cf22e 100644 --- a/StockMan.Data/Controllers/StoManController.cs +++ b/StockMan.Data/Controllers/StoManController.cs @@ -1,4 +1,5 @@ -using Microsoft.EntityFrameworkCore; +using Microsoft.Data.SqlClient; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using NLog; using StockMan.Data.DbModels; @@ -543,6 +544,28 @@ namespace StockMan.Data.Controllers return dbResult; } + + /// + /// Conferma movimenti + /// + /// + /// + public async Task ConfermaMov(int itemID) + { + bool answ = false; + using (var dbCtx = new StockManContext(_configuration)) + { + var ItemID = new SqlParameter("@ItemID", itemID); + + var callResulr = await dbCtx + .Database + .ExecuteSqlRawAsync("exec dbo.stp_ItemConsolidate @ItemID", ItemID); + + answ = true; + } + return answ; + } + #endregion Public Methods #region Private Fields