diff --git a/IOB-WIN/DATA/CONF/SIMUL_01.ini b/IOB-WIN/DATA/CONF/SIMUL_01.ini
index 62dd0ecc..0eb3d78c 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_01.ini
+++ b/IOB-WIN/DATA/CONF/SIMUL_01.ini
@@ -54,6 +54,7 @@ FORCE_DYN_DATA=TRUE
NEW_DYN_DATA=TRUE
;gestione invio pezzi in blocco
ENABLE_SEND_PZC_BLOCK=TRUE
+MIN_SEND_PZC_BLOCK=5
MAX_SEND_PZC_BLOCK=10
MIN_DURATA_ODL=240
; conf parametri memoria READ/WRITE
diff --git a/IOB-WIN/DATA/CONF/SIMUL_02.ini b/IOB-WIN/DATA/CONF/SIMUL_02.ini
index b7ba2104..e29898e0 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_02.ini
+++ b/IOB-WIN/DATA/CONF/SIMUL_02.ini
@@ -54,6 +54,7 @@ FORCE_DYN_DATA=TRUE
NEW_DYN_DATA=TRUE
;gestione invio pezzi in blocco
ENABLE_SEND_PZC_BLOCK=TRUE
+MIN_SEND_PZC_BLOCK=5
MAX_SEND_PZC_BLOCK=10
MIN_DURATA_ODL=240
; conf parametri memoria READ/WRITE
diff --git a/IOB-WIN/DATA/CONF/SIMUL_03.ini b/IOB-WIN/DATA/CONF/SIMUL_03.ini
index 14ebcede..4c39f677 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_03.ini
+++ b/IOB-WIN/DATA/CONF/SIMUL_03.ini
@@ -54,6 +54,7 @@ FORCE_DYN_DATA=TRUE
NEW_DYN_DATA=TRUE
;gestione invio pezzi in blocco
ENABLE_SEND_PZC_BLOCK=TRUE
+MIN_SEND_PZC_BLOCK=5
MAX_SEND_PZC_BLOCK=10
MIN_DURATA_ODL=240
; conf parametri memoria READ/WRITE
diff --git a/IOB-WIN/DATA/CONF/SIMUL_04.ini b/IOB-WIN/DATA/CONF/SIMUL_04.ini
index 6ed4454e..e76d74ed 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_04.ini
+++ b/IOB-WIN/DATA/CONF/SIMUL_04.ini
@@ -54,6 +54,7 @@ FORCE_DYN_DATA=TRUE
NEW_DYN_DATA=TRUE
;gestione invio pezzi in blocco
ENABLE_SEND_PZC_BLOCK=TRUE
+MIN_SEND_PZC_BLOCK=5
MAX_SEND_PZC_BLOCK=10
MIN_DURATA_ODL=240
; conf parametri memoria READ/WRITE
diff --git a/IOB-WIN/DATA/CONF/SIMUL_05.ini b/IOB-WIN/DATA/CONF/SIMUL_05.ini
index 5eddbd9d..4277e2e3 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_05.ini
+++ b/IOB-WIN/DATA/CONF/SIMUL_05.ini
@@ -54,6 +54,7 @@ FORCE_DYN_DATA=TRUE
NEW_DYN_DATA=TRUE
;gestione invio pezzi in blocco
ENABLE_SEND_PZC_BLOCK=TRUE
+MIN_SEND_PZC_BLOCK=5
MAX_SEND_PZC_BLOCK=10
MIN_DURATA_ODL=240
; conf parametri memoria READ/WRITE
diff --git a/IOB-WIN/DATA/CONF/SIMUL_06.ini b/IOB-WIN/DATA/CONF/SIMUL_06.ini
index 197a0dc1..b0f1672c 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_06.ini
+++ b/IOB-WIN/DATA/CONF/SIMUL_06.ini
@@ -54,6 +54,7 @@ FORCE_DYN_DATA=TRUE
NEW_DYN_DATA=TRUE
;gestione invio pezzi in blocco
ENABLE_SEND_PZC_BLOCK=TRUE
+MIN_SEND_PZC_BLOCK=5
MAX_SEND_PZC_BLOCK=10
MIN_DURATA_ODL=240
; conf parametri memoria READ/WRITE
diff --git a/IOB-WIN/DATA/CONF/SIMUL_07.ini b/IOB-WIN/DATA/CONF/SIMUL_07.ini
index a4ed33d2..1adc00e5 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_07.ini
+++ b/IOB-WIN/DATA/CONF/SIMUL_07.ini
@@ -54,6 +54,7 @@ FORCE_DYN_DATA=TRUE
NEW_DYN_DATA=TRUE
;gestione invio pezzi in blocco
ENABLE_SEND_PZC_BLOCK=TRUE
+MIN_SEND_PZC_BLOCK=5
MAX_SEND_PZC_BLOCK=10
MIN_DURATA_ODL=240
; conf parametri memoria READ/WRITE
diff --git a/IOB-WIN/DATA/CONF/SIMUL_08.ini b/IOB-WIN/DATA/CONF/SIMUL_08.ini
index 34f6ae93..58078caf 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_08.ini
+++ b/IOB-WIN/DATA/CONF/SIMUL_08.ini
@@ -54,6 +54,7 @@ FORCE_DYN_DATA=TRUE
NEW_DYN_DATA=TRUE
;gestione invio pezzi in blocco
ENABLE_SEND_PZC_BLOCK=TRUE
+MIN_SEND_PZC_BLOCK=5
MAX_SEND_PZC_BLOCK=10
MIN_DURATA_ODL=240
; conf parametri memoria READ/WRITE
diff --git a/IOB-WIN/DATA/CONF/SIM_DP_01.ini b/IOB-WIN/DATA/CONF/SIM_DP_01.ini
index 25d10be5..2e34f447 100644
--- a/IOB-WIN/DATA/CONF/SIM_DP_01.ini
+++ b/IOB-WIN/DATA/CONF/SIM_DP_01.ini
@@ -39,9 +39,6 @@ IOB_MULTI_CNAME=TAV_1,TAV_2
;PZCOUNT_MODE=STD.[PAR/MEM].info|BIT.indice
PZCOUNT_MODE=BIT
ENABLE_PZ_RESET=TRUE
-;gestione invio pezzi in blocco
-ENABLE_SEND_PZC_BLOCK=TRUE
-MAX_SEND_PZC_BLOCK=10
MIN_DURATA_ODL=240
; per il simulatore: 50|1 = WAIT 50, DURATION 1 con riferimento al PERIODO base (PER_BASE in ms, default 1 secondo)
PER_BASE=800
diff --git a/IOB-WIN/DATA/CONF/SIM_DP_02.ini b/IOB-WIN/DATA/CONF/SIM_DP_02.ini
index 81bdfdc9..6e6e8c4e 100644
--- a/IOB-WIN/DATA/CONF/SIM_DP_02.ini
+++ b/IOB-WIN/DATA/CONF/SIM_DP_02.ini
@@ -39,9 +39,6 @@ IOB_MULTI_CNAME=TAV_1,TAV_2
;PZCOUNT_MODE=STD.[PAR/MEM].info|BIT.indice
PZCOUNT_MODE=BIT
ENABLE_PZ_RESET=TRUE
-;gestione invio pezzi in blocco
-ENABLE_SEND_PZC_BLOCK=TRUE
-MAX_SEND_PZC_BLOCK=10
MIN_DURATA_ODL=240
; per il simulatore: 50|1 = WAIT 50, DURATION 1 con riferimento al PERIODO base (PER_BASE in ms, default 1 secondo)
PER_BASE=800
diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs
index a88fed09..e481cf01 100644
--- a/IOB-WIN/IobGeneric.cs
+++ b/IOB-WIN/IobGeneric.cs
@@ -277,11 +277,15 @@ namespace IOB_WIN
///
/// Abilitazione invio pezzi "in blocco" per recupero contapezzi
///
- public bool enableSendPzCountBlock { get; set; } = false;
+ public bool enableSendPzCountBlock = false;
///
/// Massimo numero di px da inviare in blocco
///
- public int maxSendPzCountBlock { get; set; } = 0;
+ public int maxSendPzCountBlock = 10;
+ ///
+ /// Minimo numero di px da inviare in blocco
+ ///
+ public int minSendPzCountBlock = 5;
///
@@ -617,22 +621,30 @@ namespace IOB_WIN
string currPar = getOptPar("ENABLE_SEND_PZC_BLOCK");
if (!string.IsNullOrEmpty(currPar))
{
+#if false
bool enableSend = false;
bool.TryParse(currPar, out enableSend);
- enableSendPzCountBlock = enableSend;
+ enableSendPzCountBlock = enableSend;
+#endif
+ bool.TryParse(currPar, out enableSendPzCountBlock);
// se abilitato leggo num pezzi da reinviare in blocco
if (enableSendPzCountBlock)
{
+ int.TryParse(getOptPar("MAX_SEND_PZC_BLOCK"), out maxSendPzCountBlock);
+ int.TryParse(getOptPar("MIN_SEND_PZC_BLOCK"), out minSendPzCountBlock);
+#if false
+ int numero = 0;
currPar = getOptPar("MAX_SEND_PZC_BLOCK");
if (!string.IsNullOrEmpty(currPar))
{
- int numMax = 0;
- int.TryParse(currPar, out numMax);
- if (numMax > 0)
+ int.TryParse(currPar, out numero);
+ if (numero > 0)
{
- maxSendPzCountBlock = numMax;
+ maxSendPzCountBlock = numero;
}
- }
+
+ }
+#endif
}
}
// inizializzo LUT decodifica
@@ -3098,11 +3110,12 @@ namespace IOB_WIN
// verifico se la funzione SIA abilitata
if (enableSendPzCountBlock)
{
- // se è abilitata verifico differenza: se ho DELTA > 3 --> invio un blocco <= maxSendPzCountBlock
- if (delta > 3)
+ // se è abilitata verifico differenza: se ho DELTA > minSendPzCountBlock --> invio un blocco <= maxSendPzCountBlock
+ if (delta > minSendPzCountBlock)
{
// init obj display
newDisplayData currDispData = new newDisplayData();
+ // resta indietro di ALMENO 2 pezzi x recuperare 1:1...
numIncr = delta > maxSendPzCountBlock + 1 ? maxSendPzCountBlock : delta - 2;
// invio il num max di pezzi ammesso in blocco!
lgInfo($"Predisposizione chiamata incremento contapezzi in blocco per {numIncr} pezzi");
diff --git a/IOB-WIN/IobSiemensTorri.cs b/IOB-WIN/IobSiemensTorri.cs
index adc44bde..984e9015 100644
--- a/IOB-WIN/IobSiemensTorri.cs
+++ b/IOB-WIN/IobSiemensTorri.cs
@@ -206,7 +206,7 @@ namespace IOB_WIN
lgInfo($"Differenza Contapezzi: CNC READ: {lastCountCNC} | Interno IOB {contapezzi}");
}
// verifico se variato contapezzi... e se passato ritardo minimo...
- if (lastCountCNC > contapezzi)
+ if ((lastCountCNC - contapezzi) > minSendPzCountBlock)
{
trySendPzCountBlock(ref contapezzi, lastCountCNC);
// salvo nuovo contapezzi (incremento di 1...)
diff --git a/IOB-WIN/IobSimula.cs b/IOB-WIN/IobSimula.cs
index 4718761b..13cba8f5 100644
--- a/IOB-WIN/IobSimula.cs
+++ b/IOB-WIN/IobSimula.cs
@@ -25,10 +25,6 @@ namespace IOB_WIN
public class IobSimula : IobGeneric
{
- ///
- /// Delta minimo x invio pezzi (nuova modalità)
- ///
- protected int deltaPzSend = 5;
///
/// pallet corrente
///
@@ -314,7 +310,7 @@ namespace IOB_WIN
int delta = rand.Next(0, 3);
lastCountCNC += delta;
// invio SOLO SE sono OLTRE i numSim pz e li invio TUTTI in blocco
- if ((lastCountCNC - contapezzi) > deltaPzSend)
+ if ((lastCountCNC - contapezzi) > minSendPzCountBlock)
{
trySendPzCountBlock(ref contapezzi, lastCountCNC);
// se multipallet --> cP a zero!
diff --git a/Jenkinsfile b/Jenkinsfile
index 5bd7e70a..c9233d19 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=597']) {
+ withEnv(['NEXT_BUILD_NUMBER=599']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'