Merge branch 'release/AddSlaveFixEndSetup'

This commit is contained in:
Samuele Locatelli
2022-03-18 13:35:21 +01:00
4 changed files with 14 additions and 12 deletions
+1
View File
@@ -423,3 +423,4 @@ _UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
.ionide/symbolCache.db
@@ -77,17 +77,6 @@ namespace MP_ADM.WebUserControls
}
}
/// <summary>
/// stringa UID univoca
/// </summary>
public string uid
{
get
{
return this.UniqueID.Replace("$", "_").Replace("-", "_");
}
}
#endregion Public Properties
#region Protected Methods
+12
View File
@@ -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);
}
}
}
/// <summary>
+1 -1
View File
@@ -897,7 +897,7 @@ namespace MapoDb
Dictionary<string, string> savedTask = new Dictionary<string, string>();
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}"))