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

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-12-17 15:38:46 +01:00
parent 086a3823a4 da332cfe14
commit a2ddbc9c38
4 changed files with 89 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/AdapterForm.Designer.cs
Generated
+42 -42
View File
@@ -43,8 +43,10 @@
this.start = new System.Windows.Forms.Button();
this.bIN = new System.Windows.Forms.Button();
this.bOUT = new System.Windows.Forms.Button();
this.chkForceDequeue = new System.Windows.Forms.CheckBox();
this.lblQueueLenTop = new System.Windows.Forms.Label();
this.lblPzCountIob = new System.Windows.Forms.Label();
this.lblPzCountMac = new System.Windows.Forms.Label();
this.chkForceDequeue = new System.Windows.Forms.CheckBox();
this.displTimer = new System.Windows.Forms.Timer(this.components);
this.tabData = new System.Windows.Forms.TabControl();
this.tabRealtime = new System.Windows.Forms.TabPage();
@@ -100,8 +102,6 @@
this.label10 = new System.Windows.Forms.Label();
this.lblDataProc = new System.Windows.Forms.Label();
this.lblQueueLen = new System.Windows.Forms.Label();
this.lblPzCountIob = new System.Windows.Forms.Label();
this.lblPzCountMac = new System.Windows.Forms.Label();
this.statusStrip1.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.tabData.SuspendLayout();
@@ -275,6 +275,45 @@
this.bOUT.Text = "O";
this.bOUT.UseVisualStyleBackColor = true;
//
// lblQueueLenTop
//
this.lblQueueLenTop.AutoEllipsis = true;
this.lblQueueLenTop.AutoSize = true;
this.lblQueueLenTop.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblQueueLenTop.Location = new System.Drawing.Point(310, 0);
this.lblQueueLenTop.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblQueueLenTop.Name = "lblQueueLenTop";
this.lblQueueLenTop.Size = new System.Drawing.Size(541, 30);
this.lblQueueLenTop.TabIndex = 81;
this.lblQueueLenTop.Text = "000";
this.lblQueueLenTop.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// lblPzCountIob
//
this.lblPzCountIob.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblPzCountIob.AutoSize = true;
this.lblPzCountIob.Font = new System.Drawing.Font("Arial Narrow", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblPzCountIob.Location = new System.Drawing.Point(263, 0);
this.lblPzCountIob.Name = "lblPzCountIob";
this.lblPzCountIob.Size = new System.Drawing.Size(42, 30);
this.lblPzCountIob.TabIndex = 82;
this.lblPzCountIob.Text = "pzIOB";
this.lblPzCountIob.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// lblPzCountMac
//
this.lblPzCountMac.AutoSize = true;
this.lblPzCountMac.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblPzCountMac.Font = new System.Drawing.Font("Arial Narrow", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblPzCountMac.Location = new System.Drawing.Point(215, 0);
this.lblPzCountMac.Name = "lblPzCountMac";
this.lblPzCountMac.Size = new System.Drawing.Size(42, 30);
this.lblPzCountMac.TabIndex = 83;
this.lblPzCountMac.Text = "pzMac";
this.lblPzCountMac.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// chkForceDequeue
//
this.chkForceDequeue.AutoSize = true;
@@ -289,19 +328,6 @@
this.chkForceDequeue.Text = "F";
this.chkForceDequeue.UseVisualStyleBackColor = true;
//
// lblQueueLenTop
//
this.lblQueueLenTop.AutoEllipsis = true;
this.lblQueueLenTop.AutoSize = true;
this.lblQueueLenTop.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblQueueLenTop.Location = new System.Drawing.Point(310, 0);
this.lblQueueLenTop.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblQueueLenTop.Name = "lblQueueLenTop";
this.lblQueueLenTop.Size = new System.Drawing.Size(541, 30);
this.lblQueueLenTop.TabIndex = 81;
this.lblQueueLenTop.Text = "000";
this.lblQueueLenTop.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// displTimer
//
this.displTimer.Tick += new System.EventHandler(this.displTimer_Tick);
@@ -938,32 +964,6 @@
this.lblQueueLen.TabIndex = 83;
this.lblQueueLen.Text = "###";
//
// lblPzCountIob
//
this.lblPzCountIob.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblPzCountIob.AutoSize = true;
this.lblPzCountIob.Font = new System.Drawing.Font("Arial Narrow", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblPzCountIob.Location = new System.Drawing.Point(263, 0);
this.lblPzCountIob.Name = "lblPzCountIob";
this.lblPzCountIob.Size = new System.Drawing.Size(42, 30);
this.lblPzCountIob.TabIndex = 82;
this.lblPzCountIob.Text = "pzIOB";
this.lblPzCountIob.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// lblPzCountMac
//
this.lblPzCountMac.AutoSize = true;
this.lblPzCountMac.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblPzCountMac.Font = new System.Drawing.Font("Arial Narrow", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblPzCountMac.Location = new System.Drawing.Point(215, 0);
this.lblPzCountMac.Name = "lblPzCountMac";
this.lblPzCountMac.Size = new System.Drawing.Size(42, 30);
this.lblPzCountMac.TabIndex = 83;
this.lblPzCountMac.Text = "pzMac";
this.lblPzCountMac.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// AdapterForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
IOB-WIN/IobGeneric.cs
+9 -9
View File
@@ -956,7 +956,10 @@ namespace IOB_WIN
string currServerCount = "";
string lastIdxODL = "";
if (checkServerAlive)
{
{
// leggo PRIMA ODL ....
lastIdxODL = utils.callUrl(urlGetCurrODL);
lgInfo("Lettura ODL dall'url {0} --> {1}", urlGetPzCountRec, lastIdxODL);
// se ho valori in coda da trasmettere uso dati REDIS
if (QueueIN.Count > 0 && !forceCountRec)
{
@@ -966,9 +969,6 @@ namespace IOB_WIN
// altrimenti uso dati da TCiclo registrati...
else
{
// leggo PRIMA ODL ....
lastIdxODL = utils.callUrl(urlGetCurrODL);
lgInfo("Lettura ODL dall'url {0} --> {1}", urlGetPzCountRec, lastIdxODL);
// POI leggo i pezzi
currServerCount = utils.callUrl(urlGetPzCountRec);
lgInfo("Lettura contapezzi da TCiclo dall'url {0} --> num pz: {1}", urlGetPzCountRec, currServerCount);
@@ -3087,11 +3087,11 @@ namespace IOB_WIN
if (MPOnline)
{
// SOLO SE online la macchina...
if(IobOnline)
{
int numIncr = 0;
int qtyAdded = 0;
int delta = lastCountCNC - contapezzi;
if (IobOnline)
{
int numIncr = 0;
int qtyAdded = 0;
int delta = lastCountCNC - contapezzi;
// verifico se la funzione SIA abilitata
if (enableSendPzCountBlock)
{
IOB-WIN/IobSimula.cs
+37 -16
View File
@@ -267,8 +267,22 @@ namespace IOB_WIN
}
}
}
// in primis verifico SE posso inviare in blocco i pezzi...... SE MP online
if (MPOnline)
{
// SE IOB online...
if (IobOnline)
{
// invio SOLO SE sono OLTRE i numSim pz e li invio TUTTI in blocco
if ((lastCountCNC - contapezzi) > minSendPzCountBlock)
{
trySendPzCountBlock(ref contapezzi, lastCountCNC);
}
}
}
// questa aprte la processo SOLO SE sono in run --> B_input == 3
// questa parte la processo SOLO SE sono in run --> B_input == 3
if (B_input == 3)
{
if (bit3.wait <= 0)
@@ -313,10 +327,15 @@ namespace IOB_WIN
var rand = new Random();
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) > minSendPzCountBlock)
// SOLO SE sono online...
if (IobOnline)
{
trySendPzCountBlock(ref contapezzi, lastCountCNC);
#if false
// invio SOLO SE sono OLTRE i numSim pz e li invio TUTTI in blocco
if ((lastCountCNC - contapezzi) > minSendPzCountBlock)
{
trySendPzCountBlock(ref contapezzi, lastCountCNC);
#endif
// se multipallet --> cP a zero!
if (isMulti)
{
@@ -355,18 +374,21 @@ namespace IOB_WIN
lastPzCountSend = DateTime.Now;
}
}
}
// se il contapezzi macchina è "andato troppo avanti" --> forced split ODL
if (contapezzi > lastCountCNC)
{
// solo se ODL è in lavorazione da ALMENO minDurataODL minuti...
DateTime inizioOdl = DateTime.Now.AddDays(-1);
string rawDataInizio = callUrl(urlInizioOdlIob, true);
DateTime.TryParse(rawDataInizio, out inizioOdl);
if (DateTime.Now.Subtract(inizioOdl).TotalMinutes > minDurataODL)
#if false
}
#endif
// se il contapezzi macchina è "andato troppo avanti" --> forced split ODL
if (contapezzi > lastCountCNC)
{
// invio reset ODL...
forceSplitOdl();
// solo se ODL è in lavorazione da ALMENO minDurataODL minuti...
DateTime inizioOdl = DateTime.Now.AddDays(-1);
string rawDataInizio = callUrl(urlInizioOdlIob, true);
DateTime.TryParse(rawDataInizio, out inizioOdl);
if (DateTime.Now.Subtract(inizioOdl).TotalMinutes > minDurataODL)
{
// invio reset ODL...
forceSplitOdl();
}
}
}
}
@@ -391,7 +413,6 @@ namespace IOB_WIN
}
}
}
}
/// <summary>
Jenkinsfile
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=602']) {
withEnv(['NEXT_BUILD_NUMBER=603']) {
// 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'