diff --git a/MP.INVE/Components/ListScan.razor b/MP.INVE/Components/ListScan.razor new file mode 100644 index 00000000..7cc8ac6d --- /dev/null +++ b/MP.INVE/Components/ListScan.razor @@ -0,0 +1,47 @@ +

ListScan

+ + + + + + + + + + @if (elencoSCAN != null) + { + @foreach (var item in elencoSCAN) + { + + + + + + + } + } + +
Oggetto
+
+
+ Cod: @item.ScanValue +
+
+ Lotto: @item.Lotto +
+
+
+
+ Art: @item.CodArticolo +
+
+ Qty: @Math.Round(item.Qty, 0) +
+
+
+
+ +
+
diff --git a/MP.INVE/Components/ListScan.razor.cs b/MP.INVE/Components/ListScan.razor.cs new file mode 100644 index 00000000..8ffdd6e3 --- /dev/null +++ b/MP.INVE/Components/ListScan.razor.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Components; +using System.Net.Http; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Components.Authorization; +using Microsoft.AspNetCore.Components.Forms; +using Microsoft.AspNetCore.Components.Routing; +using Microsoft.AspNetCore.Components.Web; +using Microsoft.AspNetCore.Components.Web.Virtualization; +using Microsoft.JSInterop; +using MP.INVE; +using MP.INVE.Shared; +using MP.INVE.Components; +using MP.Data.DatabaseModels; +using MP.INVE.Data; + +namespace MP.INVE.Components +{ + public partial class ListScan + { + [Inject] + MiDataService MIService { get; set; } = null!; + [Inject] + IJSRuntime JSRuntime { get; set; } = null!; + [Parameter] + public string lastScan { get; set; } = ""; + [Parameter] + public string userScan { get; set; } = null!; + [Parameter] + public int sessID { get; set; } = 0; + [Parameter] + public string magID { get; set; } = ""; + protected string rawScan { get; set; } = null!; + + List? elencoSCAN; + protected override async Task OnParametersSetAsync() + { + await Task.Delay(1); + + } + + } +} \ No newline at end of file diff --git a/MP.INVE/Components/ProcSuggestion.razor b/MP.INVE/Components/ProcSuggestion.razor index 6bc04ab3..5f7eb404 100644 --- a/MP.INVE/Components/ProcSuggestion.razor +++ b/MP.INVE/Components/ProcSuggestion.razor @@ -12,14 +12,14 @@ { -
+
@if (articoloScan != "" && quantitaScan != 0 && canSave) { @@ -65,19 +65,19 @@ } else if (articoloScan == "" && quantitaScan != 0) { -
Dati mancanti: Codice articolo
+
Dati mancanti: Codice articolo
} else if (quantitaScan == 0 && articoloScan != "") { -
Dati mancanti: Quantità a "0"
+
Dati mancanti: Quantità a "0"
} else if (isKnown) { -
Codice già scansionato per la sessione corrente
+
Codice già scansionato per la sessione corrente
} else { -
Dati mancanti: Codice articolo e Quantità
+
Dati mancanti: Codice articolo e Quantità
}
} diff --git a/MP.INVE/Components/ProcSuggestion.razor.cs b/MP.INVE/Components/ProcSuggestion.razor.cs index ee3a3890..7ea6cd30 100644 --- a/MP.INVE/Components/ProcSuggestion.razor.cs +++ b/MP.INVE/Components/ProcSuggestion.razor.cs @@ -26,20 +26,20 @@ namespace MP.INVE.Components { [Inject] private MiDataService MIService { get; set; } = null!; + [Inject] + public IJSRuntime JSRuntime { get; set; } = null!; + [Inject] + public NavigationManager NavManager { get; set; } = null!; + [Parameter] public string lastScan { get; set; } = ""; - //[Parameter] - //public EventCallback udcSend { get; set; } [Parameter] public string userScan { get; set; } = null!; [Parameter] public int sessID { get; set; } = 0; [Parameter] public string magID { get; set; } = ""; - [Inject] - public IJSRuntime JSRuntime { get; set; } = null!; - [Inject] - public NavigationManager NavManager { get; set; } = null!; + private string tipo { get; set; } = ""; private string canMod = "false"; diff --git a/MP.INVE/MP.INVE.csproj b/MP.INVE/MP.INVE.csproj index c54341d4..13d240d1 100644 --- a/MP.INVE/MP.INVE.csproj +++ b/MP.INVE/MP.INVE.csproj @@ -5,7 +5,7 @@ enable enable MP.INVE - 6.16.2212.1318 + 6.16.2212.1409 diff --git a/MP.INVE/Pages/Acquisizione.razor b/MP.INVE/Pages/Acquisizione.razor index 94640064..1c6d7d45 100644 --- a/MP.INVE/Pages/Acquisizione.razor +++ b/MP.INVE/Pages/Acquisizione.razor @@ -5,8 +5,13 @@
-
- Last scan: @rawScan +
+
+ Last scan: @rawScan +
+
+ #:@nScansioniTot +
@@ -23,9 +28,7 @@
S.@sessionId | @descr
-
- #:@nScansioniTot -
+
@magInv
diff --git a/MP.INVE/Pages/DeleteScan.razor b/MP.INVE/Pages/DeleteScan.razor new file mode 100644 index 00000000..7cb6eec6 --- /dev/null +++ b/MP.INVE/Pages/DeleteScan.razor @@ -0,0 +1,6 @@ +@page "/DeleteScan" + +

DeleteScan

+ + + diff --git a/MP.INVE/Pages/DeleteScan.razor.cs b/MP.INVE/Pages/DeleteScan.razor.cs new file mode 100644 index 00000000..88ab056b --- /dev/null +++ b/MP.INVE/Pages/DeleteScan.razor.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Components; +using System.Net.Http; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Components.Authorization; +using Microsoft.AspNetCore.Components.Forms; +using Microsoft.AspNetCore.Components.Routing; +using Microsoft.AspNetCore.Components.Web; +using Microsoft.AspNetCore.Components.Web.Virtualization; +using Microsoft.JSInterop; +using MP.INVE; +using MP.INVE.Shared; +using MP.INVE.Components; +using MP.Data.DatabaseModels; +using MP.INVE.Data; +using Microsoft.AspNetCore.WebUtilities; + +namespace MP.INVE.Pages +{ + public partial class DeleteScan + { + [Inject] + MiDataService MIService { get; set; } = null!; + [Inject] + NavigationManager NavManager { get; set; } = null!; + protected void saveScan(string newScan) + { + if (!string.IsNullOrEmpty(newScan)) + { + rawScan = newScan; + } + } + protected async Task deleteScan(ScanDataModel scan) + { + await MIService.deleteScansione(scan); + } + protected string rawScan { get; set; } = null!; + protected string idOpr { get; set; } = null!; + protected int sessionId { get; set; } = 0; + protected string magazzinoId { get; set; } = ""; + protected override async Task OnInitializedAsync() + { + await Task.Delay(1); + var uri = NavManager.ToAbsoluteUri(NavManager.Uri); + if (QueryHelpers.ParseQuery(uri.Query).TryGetValue("idOpr", out var _matrOpr) && QueryHelpers.ParseQuery(uri.Query).TryGetValue("idSess", out var _inveSessionId) && QueryHelpers.ParseQuery(uri.Query).TryGetValue("codMag", out var _idMag)) + { + idOpr = _matrOpr; + sessionId = int.Parse(_inveSessionId); + magazzinoId = _idMag; + } + } + } +} \ No newline at end of file diff --git a/MP.INVE/Pages/Invio.razor b/MP.INVE/Pages/Invio.razor index c481ef41..a9dd4f12 100644 --- a/MP.INVE/Pages/Invio.razor +++ b/MP.INVE/Pages/Invio.razor @@ -3,3 +3,6 @@

Invio

+ + + diff --git a/MP.INVE/Pages/Test.razor b/MP.INVE/Pages/Test.razor index 81671190..5ba4e00d 100644 --- a/MP.INVE/Pages/Test.razor +++ b/MP.INVE/Pages/Test.razor @@ -82,7 +82,7 @@
diff --git a/MP.INVE/Resources/ChangeLog.html b/MP.INVE/Resources/ChangeLog.html index 24e3acfa..ee89d9b1 100644 --- a/MP.INVE/Resources/ChangeLog.html +++ b/MP.INVE/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOINVE -

Versione: 6.16.2212.1318

+

Versione: 6.16.2212.1409


Note di rilascio:
  • diff --git a/MP.INVE/Resources/VersNum.txt b/MP.INVE/Resources/VersNum.txt index ca1e7157..46d2f8cf 100644 --- a/MP.INVE/Resources/VersNum.txt +++ b/MP.INVE/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2212.1318 +6.16.2212.1409 diff --git a/MP.INVE/Resources/manifest.xml b/MP.INVE/Resources/manifest.xml index a8408d22..a9a3e7e5 100644 --- a/MP.INVE/Resources/manifest.xml +++ b/MP.INVE/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2212.1318 + 6.16.2212.1409 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