From fbed207588cd66f7db55fa252d9ef361d6562572 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 18 Mar 2022 12:15:29 +0100 Subject: [PATCH 1/3] fix gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 146064f6..307c21b7 100644 --- a/.gitignore +++ b/.gitignore @@ -423,3 +423,4 @@ _UpgradeReport_Files/ Backup*/ UpgradeLog*.XML +.ionide/symbolCache.db From 75812d24ba6a9ca62e6f47f7783ae04af5f2b314 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 18 Mar 2022 12:16:03 +0100 Subject: [PATCH 2/3] fix minori (levato un doppio log x invio task2exe) --- MP-ADM/WebUserControls/cmp_righePag.ascx.cs | 11 ----------- MapoDb/DataLayer.cs | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/MP-ADM/WebUserControls/cmp_righePag.ascx.cs b/MP-ADM/WebUserControls/cmp_righePag.ascx.cs index 032a5f84..0a81eeb1 100644 --- a/MP-ADM/WebUserControls/cmp_righePag.ascx.cs +++ b/MP-ADM/WebUserControls/cmp_righePag.ascx.cs @@ -77,17 +77,6 @@ namespace MP_ADM.WebUserControls } } - /// - /// stringa UID univoca - /// - public string uid - { - get - { - return this.UniqueID.Replace("$", "_").Replace("-", "_"); - } - } - #endregion Public Properties #region Protected Methods diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs index e0c84275..4e13332d 100644 --- a/MapoDb/DataLayer.cs +++ b/MapoDb/DataLayer.cs @@ -897,7 +897,7 @@ namespace MapoDb Dictionary savedTask = new Dictionary(); try { - logger.lg.scriviLog($"Request: idxMacchina: {idxMacchina} | taskKey: {taskKey} | taskVal: {taskVal}"); + //logger.lg.scriviLog($"Request: idxMacchina: {idxMacchina} | taskKey: {taskKey} | taskVal: {taskVal}"); // leggo task attuali... currTask = mTaskMacchina(idxMacchina); if (currTask.ContainsKey($"{taskKey}")) From a4e2adc1c1cd0727e90bd1257a4472b25fa75d44 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 18 Mar 2022 13:34:57 +0100 Subject: [PATCH 3/3] Chiamata fix end setup x ogni slave machine --- MP-TAB/WebUserControls/mod_ODL.ascx.cs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs index d0b7d4cc..9c1e3fd4 100644 --- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs +++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs @@ -976,6 +976,18 @@ namespace MoonProTablet.WebUserControls DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.fixStopSetup, outData); outData = "Inserita richiesta invio Fix chiusura attrezzaggio " + outData; lblOut.Text = outData; + // se รจ master --> chiamo update child! + if (isMaster) + { + // calcolo gli slave... + var slaveList = DataLayerObj.taM2S.getByMaster(idxMacchina); + foreach (var machine in slaveList) + { + outData = $"TS:{ts}|MATR:{DataLayerObj.MatrOpr}|ODL:{idxOdlMacc}|master machine:{idxMacchinaFix}"; + // invio task x end produzione... + DataLayerObj.addTask4Machine(machine.IdxMacchinaSlave, taskType.fixStopSetup, outData); + } + } } ///