From 06ab1433f2d061402ed36ee502b18e8b0eb4c7d9 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Fri, 2 Dec 2022 13:07:22 +0100 Subject: [PATCH] avanzamento inve acquisizione + metodo get configurazione --- MP.Data/Controllers/MpInveController.cs | 28 ++++++++++++++++++++++ MP.INVE/Components/CmpTop.razor.cs | 4 +++- MP.INVE/Components/ProcSuggestion.razor | 5 ++-- MP.INVE/Components/ProcSuggestion.razor.cs | 13 ---------- MP.INVE/MP.INVE.csproj | 2 +- MP.INVE/Pages/Acquisizione.razor | 9 ++++--- MP.INVE/Resources/ChangeLog.html | 2 +- MP.INVE/Resources/VersNum.txt | 2 +- MP.INVE/Resources/manifest.xml | 2 +- 9 files changed, 43 insertions(+), 24 deletions(-) diff --git a/MP.Data/Controllers/MpInveController.cs b/MP.Data/Controllers/MpInveController.cs index 922bf910..59591e41 100644 --- a/MP.Data/Controllers/MpInveController.cs +++ b/MP.Data/Controllers/MpInveController.cs @@ -28,6 +28,34 @@ namespace MP.Data.Controllers _configuration = null; } + + #region gestione config + + /// + /// Elenco da tabella Config + /// + /// + public List ConfigGetAll() + { + List dbResult = new List(); + using (var dbCtx = new MoonProContext(_configuration)) + { + dbResult = dbCtx + .DbSetConfig + .AsNoTracking() + .OrderBy(x => x.Chiave) + .ToList(); + } + return dbResult; + } + #endregion gestione config + + + + + + + /// /// Elenco Scansioni dato Id sessione inventario /// diff --git a/MP.INVE/Components/CmpTop.razor.cs b/MP.INVE/Components/CmpTop.razor.cs index 647a3a61..3eb00344 100644 --- a/MP.INVE/Components/CmpTop.razor.cs +++ b/MP.INVE/Components/CmpTop.razor.cs @@ -40,13 +40,15 @@ namespace MP.INVE.Components #region Protected Methods + //&& !(answ.dtExp < DateTime.Now) + protected async Task getId() { OperatoreDTO answ = new OperatoreDTO(); answ = await localStorage.GetItemAsync("MatrOpr"); if (!NavManager.Uri.Contains("Jumper?")) { - if (answ != null && !(answ.dtExp < DateTime.Now)) + if (answ != null) { userName = $"{answ.Cognome} {answ.Nome} ({answ.MatrOpr})"; if (NavManager.Uri.Contains("OperatoreLogin")) diff --git a/MP.INVE/Components/ProcSuggestion.razor b/MP.INVE/Components/ProcSuggestion.razor index f622bef2..2c48c865 100644 --- a/MP.INVE/Components/ProcSuggestion.razor +++ b/MP.INVE/Components/ProcSuggestion.razor @@ -10,7 +10,6 @@ @if (udc != null) { -
  • Lotto: @@ -22,14 +21,14 @@
  • Articolo:
    - +
  • Quantità:
    - +
  • diff --git a/MP.INVE/Components/ProcSuggestion.razor.cs b/MP.INVE/Components/ProcSuggestion.razor.cs index 2d519eb2..4085063f 100644 --- a/MP.INVE/Components/ProcSuggestion.razor.cs +++ b/MP.INVE/Components/ProcSuggestion.razor.cs @@ -23,21 +23,8 @@ namespace MP.INVE.Components { [Inject] private MiDataService MIService { get; set; } = null!; - -#if false - [Parameter] - public SelectScanParams currParams { get; set; } = null!; -#endif [Parameter] public string lastScan { get; set; } = null!; - -#if false - protected string rawScan - { - get => currParams.UDC; - set => currParams.UDC = value; - } -#endif private string tipo { get; set; } = ""; public List? searchrecords; diff --git a/MP.INVE/MP.INVE.csproj b/MP.INVE/MP.INVE.csproj index 838900e8..158704a5 100644 --- a/MP.INVE/MP.INVE.csproj +++ b/MP.INVE/MP.INVE.csproj @@ -5,7 +5,7 @@ enable enable MP.INVE - 6.16.2212.210 + 6.16.2212.212 diff --git a/MP.INVE/Pages/Acquisizione.razor b/MP.INVE/Pages/Acquisizione.razor index 4ea01fe8..d93521cf 100644 --- a/MP.INVE/Pages/Acquisizione.razor +++ b/MP.INVE/Pages/Acquisizione.razor @@ -16,9 +16,12 @@
    -
    - -
    + @if (rawScan != null) + { +
    + +
    + }