Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'Test_SW1169_01' into develop

Browse Source 
Update x test su SW1169 Donati
This commit is contained in:
Samuele E. Locatelli
2026-06-17 14:03:19 +02:00
parent 796c02fc54 0764b39793
commit 12f7fc352c
4 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN-FORM/Iob/Generic.cs
+1 -1
View File
@@ -7656,7 +7656,7 @@ namespace IOB_WIN_FORM.Iob
protected virtual int trySendPzCountBlock(string fullCode, int pzCountMes, int pzCountImp)
{
int qtyAdded = 0;
lgDebug($"Chiamata trySendPzCountBlock MULTI | fullCode: {fullCode} | pzCountMes: {pzCountMes} | pzCountImp: {pzCountImp}");
lgInfo($"Chiamata trySendPzCountBlock MULTI | fullCode: {fullCode} | pzCountMes: {pzCountMes} | pzCountImp: {pzCountImp}");
// in primis HA SENSO procedere SOLO SE server MP è Online...
if (MPOnline)
{
IOB-WIN-OPC-UA/IobOpc/OpcUa.cs
+28 -16
View File
@@ -2436,7 +2436,7 @@ namespace IOB_WIN_OPC_UA.IobOpc
await application.LoadApplicationConfiguration(confPath, silent: false);
// check the application certificate.
await application.CheckApplicationInstanceCertificate(silent: false, minimumKeySize: 0);
lgInfo($"Chiamata UAClient con configurazione standard: {application.ApplicationConfiguration.ApplicationName}");
string userName = opcUaParams == null || opcUaParams.Identity == null ? "" : opcUaParams.Identity.UserName;
string passwd = opcUaParams == null || opcUaParams.Identity == null ? "" : opcUaParams.Identity.Passwd;
@@ -2745,7 +2745,6 @@ namespace IOB_WIN_OPC_UA.IobOpc
/// <summary>
/// Contapezzi assoluto macchina multi
/// </summary>
/// <exception cref="NotImplementedException"></exception>
private void processContapezziMulti()
{
/*------------------------------------------------------------
@@ -2776,7 +2775,7 @@ namespace IOB_WIN_OPC_UA.IobOpc
if (DictPzCountMes.ContainsKey(kvp.Key))
{
int delta = counterImp - DictPzCountMes[kvp.Key];
lgDebug($"Verifica Contapezzi | {kvp.Key} | Delta: {delta} | IMP: {counterImp} | MES: {DictPzCountMes[kvp.Key]}");
lgInfo($"Verifica Contapezzi | {kvp.Key} | Delta: {delta} | IMP: {counterImp} | MES: {DictPzCountMes[kvp.Key]}");
if (delta > 0)
{
string codIobTav = $"{IOBConfFull.General.CodIOB}|{kvp.Key}";
@@ -2942,6 +2941,7 @@ namespace IOB_WIN_OPC_UA.IobOpc
{
// di default metto lettura 30 sec prima
DateTime lastRead = DateTime.Now.AddSeconds(-30);
bool dataReadOk = false;
foreach (var item in dictCounters)
{
int actVal = 0;
@@ -2953,24 +2953,36 @@ namespace IOB_WIN_OPC_UA.IobOpc
if (!string.IsNullOrEmpty(rawCount))
{
int.TryParse(rawCount, out actVal);
dataReadOk = true;
// se valido (>=0) altrimenti uso zero......
actVal = actVal >= 0 ? actVal : 0;
lastRead = DateTime.Now;
}
else
{
lgWarn($"Errore in verifica remota contapezzi | url: {pzCountMesUrl}");
}
// se valido (>=0) altrimenti uso zero......
actVal = actVal >= 0 ? actVal : 0;
lastRead = DateTime.Now;
}
// se esiste aggiorno...
if (DictPzCountMes.ContainsKey(item.Key))
// se lettura OK ...
if (dataReadOk)
{
DictPzCountMes[item.Key] = actVal;
}
// altrimenti aggiungo
else
{
DictPzCountMes.Add(item.Key, actVal);
// se esiste aggiorno...
if (DictPzCountMes.ContainsKey(item.Key))
{
DictPzCountMes[item.Key] = actVal;
}
// altrimenti aggiungo
else
{
DictPzCountMes.Add(item.Key, actVal);
}
}
}
// salvo dataora ultima lettura da MES...
lastPzCountMesRead = lastRead;
// SE lettura ok... salvo dataora ultima lettura da MES...
if (dataReadOk)
{
lastPzCountMesRead = lastRead;
}
}
#endregion Private Methods
IOB-WIN-OPC-UA/IobOpc/OpcUaSiemens.cs
+2 -2
View File
@@ -131,8 +131,8 @@ namespace IOB_WIN_OPC_UA.IobOpc
}
if (resetTav)
{
// attendo
Thread.Sleep(500);
// attendo 1 sec
Thread.Sleep(1000);
// mando chiusura...
foreach (var item in IOBConfFull.Device.MultiIobList)
{
IOB-WIN-OPC-UA/postBuildTgt.bat
+2 -2
View File
@@ -45,8 +45,8 @@ REM ROBOCOPY %2 \\10.51.90.5\Steamware\IOB-WIN-OPC-UA-DEB /MIR /log:RobocopyTran
REM ROBOCOPY %2 Z:\IOB-WIN-OPC-UA-DEB /MIR
REM ROBOCOPY %2 \\10.51.90.15\Steamware\IOB-WIN-OPC-UA-DEB /MIR
REM ROBOCOPY %2 \\192.168.51.215\Steamware\IOB-WIN-OPC-UA-DEB /MIR
ROBOCOPY %2 \\10.51.90.9\Steamware\IOB-WIN-OPC-UA-DEB /MIR
REM ROBOCOPY %2 \\10.51.90.10\Steamware\IOB-WIN-OPC-UA-DEB /MIR
REM ROBOCOPY %2 \\10.51.90.9\Steamware\IOB-WIN-OPC-UA-DEB /MIR
ROBOCOPY %2 \\10.51.90.10\Steamware\IOB-WIN-OPC-UA-DEB /MIR
goto END