diff --git a/IOB-WIN/DATA/CONF/3011.ini b/IOB-WIN/DATA/CONF/3011.ini index 9f978118..968fbe6d 100644 --- a/IOB-WIN/DATA/CONF/3011.ini +++ b/IOB-WIN/DATA/CONF/3011.ini @@ -13,7 +13,7 @@ CPUTYPE=S7300 RACK=0 SLOT=2 -[SERVER] +[SERVER] MPIP=http://192.168.1.7 MPURL=/MP/IO CMDBASE=/IOB/input/ diff --git a/IOB-WIN/IobConfiguration.cs b/IOB-WIN/IobConfiguration.cs index a4bcff32..98b5b6d0 100644 --- a/IOB-WIN/IobConfiguration.cs +++ b/IOB-WIN/IobConfiguration.cs @@ -65,7 +65,7 @@ namespace IOB_WIN /// public serverMapo serverData { get; set; } /// - /// Porta del CNC Controllato + /// Tipologia dell'adapter/CNC Controllato /// public tipoAdapter tipoIob { get; set; } /// diff --git a/IOB-WIN/IobFanuc.cs b/IOB-WIN/IobFanuc.cs index 6c1f1cb7..6e035646 100644 --- a/IOB-WIN/IobFanuc.cs +++ b/IOB-WIN/IobFanuc.cs @@ -214,6 +214,8 @@ namespace IOB_WIN if (currIobConf.optPar["PZCOUNT_MODE"].StartsWith("STD")) { pzCntReload(); + // refresh associazione Macchina - IOB + sendM2IOB(); // per adesso imposto lettura fanuc == contapezzi (poi farà vera lettura...) lastCountCNC = contapezzi; } diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs index ea54708f..90863f1a 100644 --- a/IOB-WIN/IobGeneric.cs +++ b/IOB-WIN/IobGeneric.cs @@ -436,7 +436,16 @@ namespace IOB_WIN #region metodi adapter - + /// + /// Invia informazioni associazione IOB 2 machine + /// + protected void sendM2IOB() + { + if (checkServerAlive) + { + utils.callUrl(urlSetM2IOB); + } + } /// /// Effettua rilettura del contapezzi dal server MP/IO /// @@ -472,10 +481,9 @@ namespace IOB_WIN else { // se server NON pronto... - contapezzi = lastCountCNC; + contapezzi = lastCountCNC; lgError("Errore server NON pronto in pzCntReload"); } - } /// /// lettura file di persistenza @@ -606,6 +614,8 @@ namespace IOB_WIN { // rilettura contapezzi da server... SE ABILITATA pzCntReload(); + // refresh associazione Macchina - IOB + sendM2IOB(); } // dati dinamici processDynData(); @@ -1248,6 +1258,26 @@ namespace IOB_WIN return answ; } } + /// + /// URL per salvataggio dati associazione Machine 2 IOB... + /// + public string urlSetM2IOB + { + get + { + string answ = ""; + try + { + string machineName = Environment.MachineName; + answ = string.Format(@"{0}{1}{2}/setM2IOB/{3}?IOB_name={4}", currIobConf.serverData.MPIP, currIobConf.serverData.MPURL, currIobConf.serverData.CMDALIVE, currIobConf.codIOB, machineName); + } + catch (Exception exc) + { + lgError(exc, "Errore in composizione urlSetM2IOB"); + } + return answ; + } + } public string GetMACAddress() { NetworkInterface[] nics = NetworkInterface.GetAllNetworkInterfaces(); diff --git a/IOB-WIN/IobSiemensTorri.cs b/IOB-WIN/IobSiemensTorri.cs index f233a4ab..b2c8c94c 100644 --- a/IOB-WIN/IobSiemensTorri.cs +++ b/IOB-WIN/IobSiemensTorri.cs @@ -301,6 +301,8 @@ namespace IOB_WIN if (currIobConf.optPar["PZCOUNT_MODE"].StartsWith("STD")) { pzCntReload(); + // refresh associazione Macchina - IOB + sendM2IOB(); // per adesso imposto lettura fanuc == contapezzi (poi farà vera lettura...) lastCountCNC = contapezzi; } diff --git a/Jenkinsfile b/Jenkinsfile index b2242daa..e9cddb8f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=271']) { + withEnv(['NEXT_BUILD_NUMBER=272']) { // env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'