diff --git a/IOB-WIN/AdapterForm.Designer.cs b/IOB-WIN/AdapterForm.Designer.cs
index d0bb5e42..c149238a 100644
--- a/IOB-WIN/AdapterForm.Designer.cs
+++ b/IOB-WIN/AdapterForm.Designer.cs
@@ -702,7 +702,7 @@
this.txtOrdCode.Location = new System.Drawing.Point(118, 116);
this.txtOrdCode.Name = "txtOrdCode";
this.txtOrdCode.Size = new System.Drawing.Size(314, 22);
- this.txtOrdCode.TabIndex = 7;
+ this.txtOrdCode.TabIndex = 4;
//
// label15
//
@@ -837,7 +837,7 @@
this.btnSendPLC.Location = new System.Drawing.Point(297, 26);
this.btnSendPLC.Name = "btnSendPLC";
this.btnSendPLC.Size = new System.Drawing.Size(135, 23);
- this.btnSendPLC.TabIndex = 9;
+ this.btnSendPLC.TabIndex = 6;
this.btnSendPLC.Text = "SEND --> PLC";
this.btnSendPLC.UseVisualStyleBackColor = true;
this.btnSendPLC.Click += new System.EventHandler(this.BtnSendPLC_Click);
diff --git a/IOB-WIN/AdapterForm.cs b/IOB-WIN/AdapterForm.cs
index a90d45e0..982cca6e 100644
--- a/IOB-WIN/AdapterForm.cs
+++ b/IOB-WIN/AdapterForm.cs
@@ -211,7 +211,7 @@ namespace IOB_WIN
lblStatus.Text = "Loading";
checkEditMes2Plc();
-
+
// inizializzo orologi
firstStart = DateTime.Now;
lastStartTry = DateTime.Now;
@@ -296,6 +296,49 @@ namespace IOB_WIN
txtItemCode.Enabled = enableEditMes2Plc;
txtOrdCode.Enabled = enableEditMes2Plc;
txtPrgName.Enabled = enableEditMes2Plc;
+ btnSendPLC.Enabled = enableEditMes2Plc;
+ }
+ ///
+ /// Item in produzione
+ ///
+ public string currItemCode
+ {
+ get
+ {
+ return txtItemCode.Text.Trim();
+ }
+ set
+ {
+ txtItemCode.Text = value;
+ }
+ }
+ ///
+ /// Ordine in produzione
+ ///
+ public string currOrdCode
+ {
+ get
+ {
+ return txtOrdCode.Text.Trim();
+ }
+ set
+ {
+ txtOrdCode.Text = value;
+ }
+ }
+ ///
+ /// Programma in esecuzione
+ ///
+ public string currPrgName
+ {
+ get
+ {
+ return txtPrgName.Text.Trim();
+ }
+ set
+ {
+ txtPrgName.Text = value;
+ }
}
///
@@ -1072,6 +1115,11 @@ namespace IOB_WIN
public bool enableEditMes2Plc { get; set; }
private void ChkEdit_CheckedChanged(object sender, EventArgs e)
+ {
+ toggleEditMes2Plc();
+ }
+
+ private void toggleEditMes2Plc()
{
// abilita i campi --> PLC per editing
enableEditMes2Plc = !enableEditMes2Plc;
@@ -1081,8 +1129,24 @@ namespace IOB_WIN
private void BtnSendPLC_Click(object sender, EventArgs e)
{
// invia a MES i dati selezionati x ART / ODL / PRG NAME (come task2exe..)
-
- //!!!FIXME!!! FARE!!!
+ Dictionary forcedTask = new Dictionary();
+ // accodo SE !=""
+ if (currItemCode != "")
+ {
+ forcedTask.Add("setArt", currItemCode);
+ }
+ if (currOrdCode != "")
+ {
+ forcedTask.Add("setComm", currOrdCode);
+ }
+ if (currPrgName != "")
+ {
+ forcedTask.Add("setProg", currPrgName);
+ }
+ //forcedTask.Add("forceResetPzCount", "");
+ // chiedo esecuzione task!
+ iobObj.processTask(forcedTask);
+ toggleEditMes2Plc();
}
private void BtnOpenLog_Click(object sender, EventArgs e)
diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs
index df2910b9..73b2fc1b 100644
--- a/IOB-WIN/IobGeneric.cs
+++ b/IOB-WIN/IobGeneric.cs
@@ -929,7 +929,7 @@ namespace IOB_WIN
}
}
- private Dictionary processTask(Dictionary task2exe)
+ public Dictionary processTask(Dictionary task2exe)
{
Dictionary taskDone;
lgInfo($"Task2Exe: trovati {task2exe.Count} task da eseguire, procedo");
@@ -972,13 +972,22 @@ namespace IOB_WIN
case taskType.nihil:
case taskType.fixStopSetup:
case taskType.forceSetPzCount:
- case taskType.setArt:
- case taskType.setComm:
- case taskType.setProg:
case taskType.sendWatchDogMes2Plc:
taskVal = $"taskReq: {tName} | key: {item.Key} | val: {item.Value} | SKIPPED | NO EXEC";
lgInfo($"Chiamata senza processing: taskOk: {taskOk} | taskVal: {taskVal}");
break;
+ case taskType.setArt:
+ parentForm.currItemCode = item.Value;
+ taskVal = $"SET value: {item.Value}";
+ break;
+ case taskType.setComm:
+ parentForm.currOrdCode = item.Value;
+ taskVal = $"SET value: {item.Value}";
+ break;
+ case taskType.setProg:
+ parentForm.currPrgName = item.Value;
+ taskVal = $"SET value: {item.Value}";
+ break;
case taskType.forceResetPzCount:
// reset contapezzi inizio setup
taskOk = resetContapezziCNC();
diff --git a/Jenkinsfile b/Jenkinsfile
index bf9581ee..64d0400c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=459']) {
+ withEnv(['NEXT_BUILD_NUMBER=460']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'