diff --git a/MP.INVE/Components/CodeScan.razor b/MP.INVE/Components/CodeScan.razor index 8bb24799..5a1cc5a4 100644 --- a/MP.INVE/Components/CodeScan.razor +++ b/MP.INVE/Components/CodeScan.razor @@ -1,10 +1,3 @@ 
- +
- -@if (rawScan != null) -{ -
- -
-} \ No newline at end of file diff --git a/MP.INVE/Components/CodeScan.razor.cs b/MP.INVE/Components/CodeScan.razor.cs index 4c8b1654..3fbc5fd9 100644 --- a/MP.INVE/Components/CodeScan.razor.cs +++ b/MP.INVE/Components/CodeScan.razor.cs @@ -15,13 +15,15 @@ using MP.INVE; using MP.INVE.Shared; using MP.INVE.Components; using MP.INVE.Data; +using StackExchange.Redis; namespace MP.INVE.Components { public partial class CodeScan { // FIXME TODO creare evento x riportare scansione - + [Parameter] + public EventCallback lastRawScan { get; set; } /// /// Imposta il focus su input scansione /// @@ -33,15 +35,17 @@ namespace MP.INVE.Components private ElementReference target; - protected string lastScan { get; set; } = ""; + //protected string lastScan { get; set; } = ""; public SelectScanParams currParams = new SelectScanParams(); - protected string rawScan - { - get => currParams.UDC; - set => currParams.UDC = value; - } + //protected string rawScan + //{ + // get => currParams.UDC; + // set => currParams.UDC = value; + //} + + protected string LastScan = ""; protected override async Task OnAfterRenderAsync(bool firstRender) { @@ -50,6 +54,12 @@ namespace MP.INVE.Components await target.FocusAsync(); } } + + private async Task saveSel(string lastScan) + { + LastScan = lastScan; + await lastRawScan.InvokeAsync(lastScan); + } } } \ No newline at end of file diff --git a/MP.INVE/Components/ProcSuggestion.razor b/MP.INVE/Components/ProcSuggestion.razor index 1c3820f8..f622bef2 100644 --- a/MP.INVE/Components/ProcSuggestion.razor +++ b/MP.INVE/Components/ProcSuggestion.razor @@ -10,52 +10,30 @@ @if (udc != null) { -
- @* -
- - @udc.UDC - - - @tipo - -
*@ -
-
    -
  • - Lotto: -
    - - @tipo -
    -
  • -
  • - Articolo: -
    - - -
    -
  • -
  • - Quantità: -
    - - -
    -
  • -
-
- -
-
- -
- + } else { diff --git a/MP.INVE/Components/ProcSuggestion.razor.cs b/MP.INVE/Components/ProcSuggestion.razor.cs index 8125c9ea..2d519eb2 100644 --- a/MP.INVE/Components/ProcSuggestion.razor.cs +++ b/MP.INVE/Components/ProcSuggestion.razor.cs @@ -24,13 +24,20 @@ namespace MP.INVE.Components [Inject] private MiDataService MIService { get; set; } = null!; +#if false [Parameter] - public SelectScanParams currParams { get; set; } = null!; + 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; @@ -38,10 +45,9 @@ namespace MP.INVE.Components protected override async Task OnParametersSetAsync() { - //await FilterChanged.InvokeAsync(actFilter); await Task.Delay(1); searchrecords = MIService.ElencoUDC(); - udc = searchrecords.Where(x => x.UDC == rawScan).FirstOrDefault(); + udc = searchrecords.Where(x => x.UDC == lastScan).FirstOrDefault(); if (udc != null) { diff --git a/MP.INVE/MP.INVE.csproj b/MP.INVE/MP.INVE.csproj index 2988c20a..1f91448a 100644 --- a/MP.INVE/MP.INVE.csproj +++ b/MP.INVE/MP.INVE.csproj @@ -5,7 +5,7 @@ enable enable MP.INVE - 6.16.2211.2916 + 6.16.2212.118 diff --git a/MP.INVE/Pages/Acquisizione.razor b/MP.INVE/Pages/Acquisizione.razor index 7d5ced7c..4ea01fe8 100644 --- a/MP.INVE/Pages/Acquisizione.razor +++ b/MP.INVE/Pages/Acquisizione.razor @@ -6,5 +6,23 @@

Acquisizione

- +
+
+
+ @*if (rawScan != null) + { + }*@ +
+ +
+
+ +
+
+ +
\ No newline at end of file diff --git a/MP.INVE/Pages/Acquisizione.razor.cs b/MP.INVE/Pages/Acquisizione.razor.cs index b797884c..c50cce10 100644 --- a/MP.INVE/Pages/Acquisizione.razor.cs +++ b/MP.INVE/Pages/Acquisizione.razor.cs @@ -33,12 +33,16 @@ namespace MP.INVE.Pages private SelectScanParams currParams = new SelectScanParams(); private bool logged { get;set; } = false; - + protected string rawScan { get; set; } = null!; protected string idOPeratore { get; set; } = null!; protected string authKey { get; set; } = null!; protected override async Task OnInitializedAsync() { } - protected DateTime? lastScan { get; set; } = null; + protected void saveScan(string newScan) + { + rawScan = newScan; + } + //protected DateTime? lastScan { get; set; } = null; } } \ No newline at end of file diff --git a/MP.INVE/Resources/ChangeLog.html b/MP.INVE/Resources/ChangeLog.html index 33a30497..a6788146 100644 --- a/MP.INVE/Resources/ChangeLog.html +++ b/MP.INVE/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOINVE -

Versione: 6.16.2211.2916

+

Versione: 6.16.2212.118


Note di rilascio:
  • diff --git a/MP.INVE/Resources/VersNum.txt b/MP.INVE/Resources/VersNum.txt index 20db0176..6517f4d1 100644 --- a/MP.INVE/Resources/VersNum.txt +++ b/MP.INVE/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2211.2916 +6.16.2212.118 diff --git a/MP.INVE/Resources/manifest.xml b/MP.INVE/Resources/manifest.xml index a6165706..f4d674a8 100644 --- a/MP.INVE/Resources/manifest.xml +++ b/MP.INVE/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2211.2916 + 6.16.2212.118 https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/MP.INVE.zip https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/ChangeLog.html false