From a8353a4769e34316e9d615515a19e9774342098d Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 15 Nov 2024 15:47:14 +0100 Subject: [PATCH] SPEC: - fix selezione PODL se ci fosse 1 solo articolo... - config x preselezione numChar ricerca articolo --- MP.SPEC/MP.SPEC.csproj | 2 +- MP.SPEC/Pages/PODL.razor.cs | 49 +++++++++----------------------- MP.SPEC/Resources/ChangeLog.html | 2 +- MP.SPEC/Resources/VersNum.txt | 2 +- MP.SPEC/Resources/manifest.xml | 2 +- 5 files changed, 18 insertions(+), 39 deletions(-) diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index 16873a74..27f99fa4 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2411.610 + 6.16.2411.1515 1800a78a-6ff1-40f9-b490-87fb8bfc1394 en diff --git a/MP.SPEC/Pages/PODL.razor.cs b/MP.SPEC/Pages/PODL.razor.cs index 938987e3..a6eb1a62 100644 --- a/MP.SPEC/Pages/PODL.razor.cs +++ b/MP.SPEC/Pages/PODL.razor.cs @@ -76,19 +76,6 @@ namespace MP.SPEC.Pages #region Protected Methods - /// - /// Crea nuovo record e va in editing... - /// - /// - protected async Task addNew() - { - currRecord = new PODLExpModel() - { - CodArticolo = $"_NEW_{DateTime.Now:yyyyMMdd.HHmmss}" - }; - await Task.Delay(1); - } - protected async Task cancel() { currRecord = null; @@ -100,7 +87,7 @@ namespace MP.SPEC.Pages { canEdit = true; // preseleziono ricerca articolo - artSearch = selRec.CodArticolo; + artSearch = selRec.CodArticolo.Length > nArtSearch ? selRec.CodArticolo.Substring(0, nArtSearch) : selRec.CodArticolo; currRecord = selRec; await Task.Delay(1); } @@ -160,6 +147,11 @@ namespace MP.SPEC.Pages { bool.TryParse(SPEC_XODL_sync, out enableForceSync); } + string SPEC_nArtSearch = await MDService.ConfigTryGet("SPEC_nArtSearch"); + if (!string.IsNullOrEmpty(SPEC_nArtSearch)) + { + int.TryParse(SPEC_nArtSearch, out nArtSearch); + } } protected override async Task OnParametersSetAsync() @@ -210,7 +202,7 @@ namespace MP.SPEC.Pages } currRecord = new PODLExpModel() { - CodArticolo = currArticolo, + CodArticolo = "",//currArticolo, KeyBCode = codExt, KeyRichiesta = codExt, CodGruppo = codGruppo, @@ -266,7 +258,7 @@ namespace MP.SPEC.Pages await Task.Delay(1); var clonedRec = MP.Data.Utils.POdlExt.convertToPOdl(selRec); // se x qualche motivo mancasse codGruppo --> sistemo! - if(string.IsNullOrEmpty(clonedRec.CodGruppo)) + if (string.IsNullOrEmpty(clonedRec.CodGruppo)) { clonedRec.CodGruppo = currGruppoSel.CodGruppo; Log.Error($"CodGruppo mancante: messo valore selezionato: {currGruppoSel.CodGruppo}"); @@ -296,20 +288,15 @@ namespace MP.SPEC.Pages #region Private Fields private static Logger Log = LogManager.GetCurrentClassLogger(); - private PODLExpModel? _currRecord = null; - private AnagGruppi currGruppoSel = new AnagGruppi(); private PODLExpModel currRecordControlli = new PODLExpModel(); private List? ListArticoli; - private List? ListAziende; - private List? ListGruppiFase; - private List? ListMacchine; - private List? ListStati; + private int nArtSearch = 5; #endregion Private Fields @@ -339,6 +326,10 @@ namespace MP.SPEC.Pages _artSearch = value; var pUpd = Task.Run(async () => { + if (currRecord != null) + { + currRecord.CodArticolo = ""; + } await ReloadData(); }); pUpd.Wait(); @@ -346,13 +337,7 @@ namespace MP.SPEC.Pages } } - private string btnNewText - { - get => currArticolo == "" ? "Sel Articolo" : "Nuovo PODL"; - } - private bool canEdit { get; set; } = false; - private string currArticolo { get; set; } = ""; private string currAzienda { @@ -395,13 +380,7 @@ namespace MP.SPEC.Pages private PODLExpModel? currRecord { get => _currRecord; - set - { - _currRecord = value; -#if false - artSearch = value == null ? "" : value.CodArticolo.Substring(0, 2); -#endif - } + set { _currRecord = value; } } private bool filtActive diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index d6980581..a2defced 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2411.610

+

Versione: 6.16.2411.1515


Note di rilascio:
  • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 569670cf..9febc1b9 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2411.610 +6.16.2411.1515 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index c0486d9d..20201953 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2411.610 + 6.16.2411.1515 https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html false