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

Merge branch 'release/SprintToVers3.8_03'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-02-27 06:55:03 +01:00
parent 08cc3abede c6260289db
commit dcdc71bc73
7 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN-FANUC/IOB-WIN-FANUC.csproj
+6
View File
@@ -169,10 +169,16 @@
<None Include="DATA\CONF\EV101.json" />
<None Include="DATA\CONF\EV102.ini" />
<None Include="DATA\CONF\EV102.json" />
<None Include="DATA\CONF\EV103.ini" />
<None Include="DATA\CONF\EV103.json" />
<None Include="DATA\CONF\EV105.ini" />
<None Include="DATA\CONF\EV105.json" />
<None Include="DATA\CONF\EV106.ini" />
<None Include="DATA\CONF\EV106.json" />
<None Include="DATA\CONF\EV107.ini" />
<None Include="DATA\CONF\EV107.json" />
<None Include="DATA\CONF\EV108.ini" />
<None Include="DATA\CONF\EV108.json" />
<None Include="DATA\CONF\EV109.ini" />
<None Include="DATA\CONF\EV109.json" />
<None Include="DATA\CONF\EV110.ini" />
IOB-WIN-FORM/Iob/Generic.cs
+5
View File
@@ -3627,6 +3627,11 @@ namespace IOB_WIN_FORM.Iob
/// </summary>
protected DateTime adpStartRun;
/// <summary>
/// DataOra avvio Programma x check avvio
/// </summary>
protected DateTime prgStarted = DateTime.Now;
/// <summary>
/// Vettore 32 BIT valori in ingresso al filtro
/// </summary>
IOB-WIN-SIEMENS/DATA/CONF/MAIN.ini
+1
View File
@@ -34,6 +34,7 @@ CLI_INST=SteamWareSim
;STARTLIST=VL26
STARTLIST=PIZ08
;STARTLIST=VL25
;STARTLIST=GT554
MAXCNC=10
IOB-WIN-SIEMENS/IOB-WIN-SIEMENS.csproj
+3 -9
View File
@@ -204,15 +204,9 @@
<None Include="DATA\CONF\MAIN.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\PIZ03.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\PIZ03.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\PIZ03_alarm.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\PIZ03.ini" />
<None Include="DATA\CONF\PIZ03.json" />
<None Include="DATA\CONF\PIZ03_alarm.json" />
<None Include="DATA\CONF\PIZ08.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
IOB-WIN-SIEMENS/IobSiemens/Siemens.cs
+4 -2
View File
@@ -350,11 +350,13 @@ namespace IOB_WIN_SIEMENS.IobSiemens
// proseguo SOLO SE ho un pzCount > 0...
if (pzCountAll >= 0)
{
// 2025.02.26 aggiunto controllo che non sia appena avviato IOB
bool isJustStarted = DateTime.Now.Subtract(prgStarted).TotalMinutes < 3;
// verifico il NUOVO contapezzi PRIMA di accettare ogni incremento...
int deltaPzCount = pzCountAll - contapezziPLC;
double maxDelta = DateTime.Now.Subtract(plcLastPzRead).TotalMinutes / (plcAvgTc / 60);
// se incremento superiore del doppio atteso --> segnalo errore e NON accetto
if (deltaPzCount > maxDelta * (maxPzDeltaPerc / 100))
// se incremento superiore del doppio atteso e NON parto da zero pezzi = appena avviato --> segnalo errore e NON accetto
if (deltaPzCount > maxDelta * (maxPzDeltaPerc / 100) && !isJustStarted)
{
lgError($"[DELTA CHECK]: intremento contapezziPLC troppo elevato: lettura {pzCountAll} | contapezzi attuale: {contapezziPLC} | ultima lettura PLC: {plcLastPzRead} | TCiclo medio: {plcAvgTc}s | incremento accettato ");
}
IOB-WIN-SIEMENS/IobSiemens/SiemensFape.cs
+10 -1
View File
@@ -3,6 +3,7 @@ using IOB_UT_NEXT.Config;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace IOB_WIN_SIEMENS.IobSiemens
{
@@ -197,7 +198,15 @@ namespace IOB_WIN_SIEMENS.IobSiemens
{
try
{
currODL = utils.callUrl(urlGetCurrODL);
currODL = utils.callUrlNow(urlGetCurrODL);
#if false
// se nullo riprovo...
if (string.IsNullOrEmpty(currODL))
{
Task.Delay(1000);
currODL = utils.callUrl(urlGetCurrODL);
}
#endif
// solo SE HO un ODL...
if (string.IsNullOrWhiteSpace(currODL) || currODL == "0")
{
IOB-WIN-SIEMENS/postBuildTgt.bat
+1
View File
@@ -47,6 +47,7 @@ REM ROBOCOPY %2 Z:\IOB-WIN-SIEMENS-DEB /MIR
REM ROBOCOPY %2 \\10.51.90.9\Steamware\IOB-WIN-SIEMENS-DEB /MIR
REM ROBOCOPY %2 \\10.51.90.10\Steamware\IOB-WIN-SIEMENS-DEB /MIR
ROBOCOPY %2 \\10.51.90.11\Steamware\IOB-WIN-SIEMENS-DEB /MIR
REM ROBOCOPY %2 \\10.51.90.13\Steamware\IOB-WIN-SIEMENS-DEB /MIR
goto END