diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs index 883e300c..76ebdebf 100644 --- a/MP.Data/Controllers/MpSpecController.cs +++ b/MP.Data/Controllers/MpSpecController.cs @@ -589,6 +589,30 @@ namespace MP.Data.Controllers return dbResult; } + + /// + /// Elenco PODL non avviati filtrati x articolo, KeyRich (che contiene stato) + /// + /// Cod articolo + /// KeyRich (parziale) da cercare (es cod stato x yacht) + /// + public List ListPODLFiltNOOdl(string codArt, string keyRichPart) + { + List dbResult = new List(); + using (var dbCtx = new MoonProContext(_configuration)) + { + dbResult = dbCtx + .DbSetPODL + .Where(x => (x.IdxOdl != 0) && (x.KeyRichiesta.Contains(keyRichPart) || keyRichPart == "*") && (codArt == "*" || x.CodArticolo.Contains(codArt))) + .AsNoTracking() + .Include(m => m.MachineNav) + .Include(a => a.ArticoloNav) + .OrderByDescending(x => x.InsertDate) + .ToList(); + } + return dbResult; + } + /// /// Elenco valori ammessi x tabella/colonna /// diff --git a/MP.INVE/MP.INVE.csproj b/MP.INVE/MP.INVE.csproj index e6283c23..3bbca691 100644 --- a/MP.INVE/MP.INVE.csproj +++ b/MP.INVE/MP.INVE.csproj @@ -5,7 +5,7 @@ enable enable MP.INVE - 6.16.2211.2408 + 6.16.2211.2409 diff --git a/MP.INVE/Resources/ChangeLog.html b/MP.INVE/Resources/ChangeLog.html index 29a93835..e04041b3 100644 --- a/MP.INVE/Resources/ChangeLog.html +++ b/MP.INVE/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOINVE -

Versione: 6.16.2211.2408

+

Versione: 6.16.2211.2409


Note di rilascio:
  • diff --git a/MP.INVE/Resources/VersNum.txt b/MP.INVE/Resources/VersNum.txt index d7d07cfe..994b8650 100644 --- a/MP.INVE/Resources/VersNum.txt +++ b/MP.INVE/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2211.2408 +6.16.2211.2409 diff --git a/MP.INVE/Resources/manifest.xml b/MP.INVE/Resources/manifest.xml index c170f1ec..9e7d53cd 100644 --- a/MP.INVE/Resources/manifest.xml +++ b/MP.INVE/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2211.2408 + 6.16.2211.2409 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 diff --git a/MP.SPEC/Components/ListODL.razor b/MP.SPEC/Components/ListODL.razor index eda270ca..f5e4b7ba 100644 --- a/MP.SPEC/Components/ListODL.razor +++ b/MP.SPEC/Components/ListODL.razor @@ -55,8 +55,31 @@ else } -
    ODL @($"{record.IdxOdl:000000}")
    -
    PODL @($"{getPodl(record.IdxOdl):000000}")
    +
    +
    +
    + ODL +
    +
    + @($"{record.IdxOdl.ToString(padCodXdl)}") +
    +
    +
    +
    + PODL +
    + @if (getPodl(record.IdxOdl) > 0) + { +
    + @($"{getPodl(record.IdxOdl).ToString(padCodXdl)}") +
    + } + else + { +

    ------

    + } +
    +
    @record.CodArticolo diff --git a/MP.SPEC/Components/ListODL.razor.cs b/MP.SPEC/Components/ListODL.razor.cs index 6f11213c..7e776432 100644 --- a/MP.SPEC/Components/ListODL.razor.cs +++ b/MP.SPEC/Components/ListODL.razor.cs @@ -14,6 +14,9 @@ namespace MP.SPEC.Components [Parameter] public SelectOdlParams currFilter { get; set; } = null!; + [Parameter] + public string padCodXdl { get; set; } = "0000"; + [Parameter] public EventCallback PagerResetReq { get; set; } @@ -122,6 +125,17 @@ namespace MP.SPEC.Components await reloadData(); } + protected int getPodl(int idxOdl) + { + int answ = 0; + var pOdlData = MDService.PODL_getByOdl(idxOdl); + if (pOdlData != null) + { + answ = pOdlData.IdxPromessa; + } + return answ; + } + protected override async Task OnInitializedAsync() { ListStati = await MDService.AnagStatiComm(); @@ -253,17 +267,6 @@ namespace MP.SPEC.Components } } - protected int getPodl(int idxOdl) - { - int answ = 0; - var pOdlData = MDService.PODL_getByOdl(idxOdl); - if (pOdlData != null) - { - answ = pOdlData.IdxPromessa; - } - return answ; - } - private bool hideSpenta { get; set; } = false; /// diff --git a/MP.SPEC/Components/ListPODL.razor b/MP.SPEC/Components/ListPODL.razor index c8188a62..b27a5106 100644 --- a/MP.SPEC/Components/ListPODL.razor +++ b/MP.SPEC/Components/ListPODL.razor @@ -36,31 +36,54 @@ else @foreach (var record in ListRecords) { - - @if (canStartOdl(record.IdxMacchina)) - { - - } - else - { - - } + - @if (canStartOdl(record.IdxMacchina)) + @if (record.IdxOdl == 0) { - - } - else - { - + @if (canStartOdl(record.IdxMacchina)) + { + + } + else + { + + } + @if (canStartOdl(record.IdxMacchina)) + { + + } + else + { + + } } -
    PODL @($"{record.IdxPromessa:000000}")
    +
    +
    +
    + PODL +
    +
    + @($"{record.IdxPromessa.ToString(padCodXdl)}") +
    +
    + @if (record.IdxOdl > 0) + { +
    +
    + ODL +
    +
    + @($"{record.IdxOdl.ToString(padCodXdl)}") +
    +
    + } +
    @record.CodArticolo diff --git a/MP.SPEC/Components/ListPODL.razor.cs b/MP.SPEC/Components/ListPODL.razor.cs index dd5efe89..33539043 100644 --- a/MP.SPEC/Components/ListPODL.razor.cs +++ b/MP.SPEC/Components/ListPODL.razor.cs @@ -4,6 +4,7 @@ using MP.Data.DatabaseModels; using MP.SPEC.Data; using MP.SPEC.Services; using NLog; +using StackExchange.Redis; namespace MP.SPEC.Components { @@ -14,6 +15,9 @@ namespace MP.SPEC.Components [Parameter] public SelectPOdlParams actFilter { get; set; } = new SelectPOdlParams(); + [Parameter] + public string padCodXdl { get; set; } = "0000"; + [Parameter] public EventCallback PagerResetReq { get; set; } @@ -195,11 +199,19 @@ namespace MP.SPEC.Components await Task.Delay(1); await callSyncDb(selRec.IdxMacchina); await Task.Delay(1); + + // svuoto memorie pagina... + await MDService.FlushRedisCache(); + NavManager.NavigateTo(NavManager.Uri, true); } } } } + + [Inject] + protected NavigationManager NavManager { get; set; } = null!; + protected async Task UpdateData() { currRecord = null; @@ -239,6 +251,12 @@ namespace MP.SPEC.Components set => actFilter.CurrPage = value; } + private bool hasOdl + { + get => actFilter.hasOdl; + set => actFilter.hasOdl = value; + } + private bool isLoading { get; set; } = false; private SelectPOdlParams lastFilter { get; set; } = new SelectPOdlParams() { CurrPage = -1 }; @@ -383,8 +401,16 @@ namespace MP.SPEC.Components private async Task reloadData() { + ListRecords = null; isLoading = true; - SearchRecords = await MDService.ListPODLFilt(SearchVal, StatoSel); + if (hasOdl) + { + SearchRecords = await MDService.ListPODLFiltNOOdl(SearchVal, StatoSel); + } + else + { + SearchRecords = await MDService.ListPODLFilt(SearchVal, StatoSel); + } totalCount = SearchRecords.Count; ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); await Task.Delay(1); diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs index 32635129..e76e0a6b 100644 --- a/MP.SPEC/Data/MpDataService.cs +++ b/MP.SPEC/Data/MpDataService.cs @@ -312,6 +312,27 @@ namespace MP.SPEC.Data return result; } + /// + /// Restituisce valore della stringa (SE disponibile) + /// + /// + /// + public async Task tryGetConfig(string keyName) + { + string answ = ""; + // preselezione valori + var configData = await ConfigGetAll(); + var currRec = configData.FirstOrDefault(x => x.Chiave == keyName); + if (currRec != null) + { + answ = currRec.Valore; + } + + return answ; + } + + + /// /// Reset dati cache config /// @@ -506,6 +527,7 @@ namespace MP.SPEC.Data return answ; } + /// /// Elenco ultimi n record flux log dato macchina e flusso (ordinato x data registrazione) /// @@ -644,6 +666,44 @@ namespace MP.SPEC.Data return result; } + + /// + /// Elenco PODL avviati filtrati x articolo, KeyRich (che contiene stato) + /// + /// Cod articolo + /// KeyRich (parziale) da cercare (es cod stato x yacht) + /// + public async Task> ListPODLFiltNOOdl(string codArt, string keyRichPart) + { + List? result = new List(); + Stopwatch stopWatch = new Stopwatch(); + stopWatch.Start(); + string readType = "DB"; + string currKey = $"{redisPOdlListNOOdl}:{codArt}:{keyRichPart}"; + // cerco in redis dato valore sel macchina... + RedisValue rawData = redisDb.StringGet(currKey); + if (rawData.HasValue) + { + result = JsonConvert.DeserializeObject>($"{rawData}"); + readType = "REDIS"; + } + else + { + result = await Task.FromResult(dbController.ListPODLFiltNOOdl(codArt, keyRichPart)); + // serializzo e salvo... + rawData = JsonConvert.SerializeObject(result); + redisDb.StringSet(currKey, rawData, TimeSpan.FromSeconds(3)); + } + if (result == null) + { + result = new List(); + } + stopWatch.Stop(); + TimeSpan ts = stopWatch.Elapsed; + Log.Debug($"ListPODLFiltNOOdl | Read from {readType}: {ts.TotalMilliseconds}ms"); + return result; + } + /// /// Elenco di tutte le macchine gestite /// @@ -1113,6 +1173,7 @@ namespace MP.SPEC.Data private const string redisPOdlByOdl = redisBaseAddr + "SPEC:Cache:POdlByOdl"; private const string redisPOdlByPOdl = redisBaseAddr + "SPEC:Cache:POdlByPOdl"; private const string redisPOdlList = redisBaseAddr + "SPEC:Cache:POdlList"; + private const string redisPOdlListNOOdl = redisBaseAddr + "SPEC:Cache:POdlListNOOdl"; private const string redisStatoCom = redisBaseAddr + "SPEC:Cache:StatoCom"; private const string redisTipoArt = redisBaseAddr + "SPEC:Cache:TipoArt"; diff --git a/MP.SPEC/Data/SelectGlobalToggle.cs b/MP.SPEC/Data/SelectGlobalToggle.cs index 527bc25a..53f19dfe 100644 --- a/MP.SPEC/Data/SelectGlobalToggle.cs +++ b/MP.SPEC/Data/SelectGlobalToggle.cs @@ -12,7 +12,7 @@ #region Public Properties /// - /// Bool: indica se il toggle è attivo + /// Bool: indica se il toggleClosed è attivo /// public bool isActive { get; set; } = true; diff --git a/MP.SPEC/Data/SelectPOdlParams.cs b/MP.SPEC/Data/SelectPOdlParams.cs index 0c743ce7..7d8b35f4 100644 --- a/MP.SPEC/Data/SelectPOdlParams.cs +++ b/MP.SPEC/Data/SelectPOdlParams.cs @@ -26,6 +26,7 @@ namespace MP.SPEC.Data public string SearchVal { get; set; } = "*"; public int TotCount { get; set; } = 0; + public bool hasOdl { get; set; } = false; #endregion Public Properties @@ -41,7 +42,8 @@ namespace MP.SPEC.Data MaxRecord = this.MaxRecord, NumRec = this.NumRec, SearchVal = this.SearchVal, - TotCount = this.TotCount + TotCount = this.TotCount, + hasOdl = this.hasOdl }; return clonedData; } @@ -72,6 +74,9 @@ namespace MP.SPEC.Data if (SearchVal != item.SearchVal) return false; + if (hasOdl != item.hasOdl) + return false; + return true; } diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index 4830c1e9..45554cf4 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2211.2317 + 6.16.2211.2410 diff --git a/MP.SPEC/Pages/Articoli.razor.cs b/MP.SPEC/Pages/Articoli.razor.cs index a558357a..c69fc1ca 100644 --- a/MP.SPEC/Pages/Articoli.razor.cs +++ b/MP.SPEC/Pages/Articoli.razor.cs @@ -129,12 +129,15 @@ namespace MP.SPEC.Pages protected override async Task OnInitializedAsync() { numRecord = 10; +#if false configData = await MDService.ConfigGetAll(); var currRec = configData.FirstOrDefault(x => x.Chiave == "AZIENDA"); if (currRec != null) { selAzienda = currRec.Valore; - } + } +#endif + selAzienda = await MDService.tryGetConfig("AZIENDA"); ListAziende = await MDService.ElencoAziende(); ListTipoArt = await MDService.AnagTipoArtLV(); } @@ -210,7 +213,10 @@ namespace MP.SPEC.Pages private int _currPage { get; set; } = 1; private int _numRecord { get; set; } = 10; - private List? configData { get; set; } = null; + +#if false + private List? configData { get; set; } = null; +#endif private int currPage { diff --git a/MP.SPEC/Pages/Index.razor.cs b/MP.SPEC/Pages/Index.razor.cs index 0751fffd..1193385d 100644 --- a/MP.SPEC/Pages/Index.razor.cs +++ b/MP.SPEC/Pages/Index.razor.cs @@ -30,6 +30,7 @@ namespace MP.SPEC.Pages MessageService.ShowSearch = false; // recupero elenco JQM ElencoLink = await MDService.ElencoLink(); +#if false configData = await MDService.ConfigGetAll(); if (configData != null) { @@ -38,7 +39,9 @@ namespace MP.SPEC.Pages { currAzienda = currRec.Valore; } - } + } +#endif + currAzienda = await MDService.tryGetConfig("AZIENDA"); await Task.Delay(1); } @@ -52,7 +55,9 @@ namespace MP.SPEC.Pages #region Private Properties - private List? configData { get; set; } = null; +#if false + private List? configData { get; set; } = null; +#endif #endregion Private Properties } diff --git a/MP.SPEC/Pages/ODL.razor b/MP.SPEC/Pages/ODL.razor index b31a35a4..bd021744 100644 --- a/MP.SPEC/Pages/ODL.razor +++ b/MP.SPEC/Pages/ODL.razor @@ -113,7 +113,7 @@
    - +
    diff --git a/MP.SPEC/Pages/ODL.razor.cs b/MP.SPEC/Pages/ODL.razor.cs index 1925fb7c..155410dc 100644 --- a/MP.SPEC/Pages/ODL.razor.cs +++ b/MP.SPEC/Pages/ODL.razor.cs @@ -98,6 +98,7 @@ namespace MP.SPEC.Pages { ListStati = await MDService.AnagStatiComm(); ListMacchine = await MDService.MacchineWithFlux(currFilter.DtStart, currFilter.DtEnd); + padCodXdl = await MDService.tryGetConfig("padCodXdl"); } protected async Task pgResetReq(bool doReset) @@ -112,6 +113,8 @@ namespace MP.SPEC.Pages } } + private string padCodXdl { get; set; } = "00000"; + protected void setDtMax() { // copio il filtro diff --git a/MP.SPEC/Pages/PODL.razor b/MP.SPEC/Pages/PODL.razor index 71a4089e..3bcdd3c7 100644 --- a/MP.SPEC/Pages/PODL.razor +++ b/MP.SPEC/Pages/PODL.razor @@ -6,9 +6,20 @@
    -
    +

    Promesse ODL

    +
    +
    +
    + Da Produrre +
    + +
    + Lanciati +
    +
    +
    @if (addEnabled) { @@ -17,7 +28,7 @@
    -
    +
    @* +
    @@ -253,7 +264,7 @@ } else { - + }
    diff --git a/MP.SPEC/Pages/PODL.razor.cs b/MP.SPEC/Pages/PODL.razor.cs index aebe0de9..5b54c2d6 100644 --- a/MP.SPEC/Pages/PODL.razor.cs +++ b/MP.SPEC/Pages/PODL.razor.cs @@ -73,6 +73,7 @@ namespace MP.SPEC.Pages ListMacchine = await MDService.MacchineGetAll(); ListStati = await MDService.AnagStatiComm(); SearchRecords = await MDService.ListPODLFilt("*", "*"); +#if false // preselezione valori configData = await MDService.ConfigGetAll(); var currRec = configData.FirstOrDefault(x => x.Chiave == "AZIENDA"); @@ -80,6 +81,9 @@ namespace MP.SPEC.Pages { currAzienda = currRec.Valore; } +#endif + currAzienda = await MDService.tryGetConfig("AZIENDA"); + padCodXdl = await MDService.tryGetConfig("padCodXdl"); // carico dati await reloadData(); } @@ -92,7 +96,6 @@ namespace MP.SPEC.Pages pagerODL.resetCurrPage(); } } - private List? SearchRecords; /// /// Crea nuovo record e va in editing... @@ -101,10 +104,10 @@ namespace MP.SPEC.Pages protected async Task reqNewPODL() { // aggiungo record articolo - if (SearchRecords != null) - { - currRecordControlli = SearchRecords.FirstOrDefault(); - } + //if (SearchRecords != null) + //{ + // currRecordControlli = SearchRecords.FirstOrDefault(); + //} //currArticolo = ""; if (ListArticoli != null && ListArticoli.Count > 0) @@ -150,6 +153,12 @@ namespace MP.SPEC.Pages await Task.Delay(1); } + protected async Task toggleClosed() + { + hasOdl = !hasOdl; + await Task.Delay(1); + } + protected async Task update(PODLModel selRec) { if (!await JSRuntime.InvokeAsync("confirm", "Confermi di voler salvare le modifiche?")) @@ -176,15 +185,20 @@ namespace MP.SPEC.Pages private static Logger Log = LogManager.GetCurrentClassLogger(); private PODLModel? _currRecord = null; - private PODLModel? _currRecordControlli = null; + private PODLModel currRecordControlli = new PODLModel(); private List? ListArticoli; private List? ListAziende; private List? ListGruppiFase; private List? ListMacchine; private List? ListStati; + private List? SearchRecords; #endregion Private Fields +#if false + private PODLModel? _currRecordControlli = null; +#endif + #region Private Properties private string _artSearch { get; set; } = ""; @@ -212,28 +226,14 @@ namespace MP.SPEC.Pages } } - private bool selectFirst(string idxMacchina) - { - string firstMacchina = ""; - bool answ = false; - if (ListMacchine != null) - { - var rawData = ListMacchine.Select(x => x.IdxMacchina).FirstOrDefault(); - firstMacchina = rawData != null ? rawData : ""; - } - if (firstMacchina == idxMacchina) - { - answ = true; - } - return answ; - } - private string btnNewText { get => currArticolo == "" ? "Sel Articolo" : "Nuovo PODL"; } +#if false private List? configData { get; set; } = null; +#endif private string currArticolo { get; set; } = ""; private string currAzienda @@ -283,7 +283,18 @@ namespace MP.SPEC.Pages artSearch = value == null ? "" : value.CodArticolo; } } - private PODLModel currRecordControlli = new PODLModel(); + + private bool hasOdl + { + get => currFilter.hasOdl; + set + { + if (currFilter.hasOdl != value) + { + currFilter.hasOdl = value; + } + } + } private bool isLoading { get; set; } = false; @@ -293,6 +304,8 @@ namespace MP.SPEC.Pages set => currFilter.NumRec = value; } + private string padCodXdl { get; set; } = "00000"; + private int totalCount { get => currFilter.TotCount; diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index ae0e5aca..5d01359d 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

    Versione: 6.16.2211.2317

    +

    Versione: 6.16.2211.2410


    Note di rilascio:
    • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index f49cad53..ca2c4e8f 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2211.2317 +6.16.2211.2410 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index 97c9a7b8..96f7f037 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2211.2317 + 6.16.2211.2410 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