diff --git a/Jenkinsfile b/Jenkinsfile
index 1f54353e..aa3e7eb5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=810']) {
+ withEnv(['NEXT_BUILD_NUMBER=811']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
diff --git a/MP-Admin/WebUserControls/mod_approvazioneODL.ascx b/MP-Admin/WebUserControls/mod_approvazioneODL.ascx
index b5ab2d1f..1fd0bf46 100644
--- a/MP-Admin/WebUserControls/mod_approvazioneODL.ascx
+++ b/MP-Admin/WebUserControls/mod_approvazioneODL.ascx
@@ -31,7 +31,7 @@
-
- <%----%>
+
diff --git a/MP-Admin/WebUserControls/mod_approvazioneODL.ascx.designer.cs b/MP-Admin/WebUserControls/mod_approvazioneODL.ascx.designer.cs
index 3893148d..9ea26cd2 100644
--- a/MP-Admin/WebUserControls/mod_approvazioneODL.ascx.designer.cs
+++ b/MP-Admin/WebUserControls/mod_approvazioneODL.ascx.designer.cs
@@ -1,42 +1,41 @@
//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
+//
+// Codice generato da uno strumento.
//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
+// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+// il codice viene rigenerato.
+//
//------------------------------------------------------------------------------
-namespace MoonProAdmin.WebUserControls
-{
-
-
+namespace MoonProAdmin.WebUserControls {
+
+
public partial class mod_approvazioneODL {
///
- /// grView control.
+ /// Controllo grView.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.GridView grView;
///
- /// odsTempi control.
+ /// Controllo odsTempi.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.ObjectDataSource odsTempi;
///
- /// txtPageSize control.
+ /// Controllo txtPageSize.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.TextBox txtPageSize;
}
diff --git a/MP-TAB/WebMasterPages/Bootstrap.Master b/MP-TAB/WebMasterPages/Bootstrap.Master
index 6da42886..b5e7fc94 100644
--- a/MP-TAB/WebMasterPages/Bootstrap.Master
+++ b/MP-TAB/WebMasterPages/Bootstrap.Master
@@ -4,7 +4,7 @@
<%@ Register Src="~/WebUserControls/mod_footer.ascx" TagPrefix="uc1" TagName="mod_footer" %>
-
+
diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs
index 6194e4c2..af18a04c 100644
--- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs
+++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs
@@ -149,7 +149,10 @@ namespace MoonProTablet.WebUserControls
{
((WebControl)lbtn).CssClass = ((WebControl)lbtn).CssClass.Replace("disabled", "");
// se richiesto metto disabled...
- if (!((WebControl)lbtn).Enabled) ((WebControl)lbtn).CssClass += " disabled";
+ if (!((WebControl)lbtn).Enabled)
+ {
+ ((WebControl)lbtn).CssClass += " disabled";
+ }
}
catch
{ }
@@ -256,13 +259,19 @@ namespace MoonProTablet.WebUserControls
// processo evento...
inCmd = controllerMapo.scriviRigaEventoBarcode(idxMacchina, idxEvento, CodArticolo, "", rigaStato.MatrOpr, rigaStato.pallet);
// verifico se serva refresh
- if (inCmd.needStatusRefresh) needStRefresh = true;
+ if (inCmd.needStatusRefresh)
+ {
+ needStRefresh = true;
+ }
// se la macchina è MULTI (cod#tavola) e sonoa INIZIO/FINE attrezzaggio (idxEv <=2) processo ANCHE per la macchina madre...
if (idxMacchina.IndexOf('#') > 0 && idxEvento <= 2)
{
string idxMacchinaParent = idxMacchina.Substring(0, idxMacchina.IndexOf('#'));
inCmd2 = controllerMapo.scriviRigaEventoBarcode(idxMacchinaParent, idxEvento, CodArticolo, "", rigaStato.MatrOpr, rigaStato.pallet);
- if (inCmd2.needStatusRefresh) needStRefresh = true;
+ if (inCmd2.needStatusRefresh)
+ {
+ needStRefresh = true;
+ }
}
if (needStRefresh)
{
@@ -326,7 +335,8 @@ namespace MoonProTablet.WebUserControls
int idxODL_curr = 0;
confermaProdOdl(false);
if (idxODLSel > 0)
- { // se vedesse TCRich a zero lo reimposta a quello assegnato...
+ {
+ // se vedesse TCRich a zero lo reimposta a quello assegnato...
if (TCRichAttr == 0)
{
TCRichAttr = TCAssegnato(idxODLSel);
diff --git a/MapoDb/DS_ProdTempi.Designer.cs b/MapoDb/DS_ProdTempi.Designer.cs
index 7942eb7d..c9f03c59 100644
--- a/MapoDb/DS_ProdTempi.Designer.cs
+++ b/MapoDb/DS_ProdTempi.Designer.cs
@@ -1408,6 +1408,8 @@ namespace MapoDb {
private global::System.Data.DataColumn columnPzPallet;
+ private global::System.Data.DataColumn columnOperSetup;
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public ODLDataTable() {
@@ -1585,6 +1587,14 @@ namespace MapoDb {
}
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+ public global::System.Data.DataColumn OperSetupColumn {
+ get {
+ return this.columnOperSetup;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -1639,7 +1649,8 @@ namespace MapoDb {
decimal TCRichAttr,
bool ToAs400,
string CommessaAs400,
- int PzPallet) {
+ int PzPallet,
+ string OperSetup) {
ODLRow rowODLRow = ((ODLRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -1659,7 +1670,8 @@ namespace MapoDb {
TCRichAttr,
ToAs400,
CommessaAs400,
- PzPallet};
+ PzPallet,
+ OperSetup};
rowODLRow.ItemArray = columnValuesArray;
this.Rows.Add(rowODLRow);
return rowODLRow;
@@ -1707,6 +1719,7 @@ namespace MapoDb {
this.columnToAs400 = base.Columns["ToAs400"];
this.columnCommessaAs400 = base.Columns["CommessaAs400"];
this.columnPzPallet = base.Columns["PzPallet"];
+ this.columnOperSetup = base.Columns["OperSetup"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1748,6 +1761,8 @@ namespace MapoDb {
base.Columns.Add(this.columnCommessaAs400);
this.columnPzPallet = new global::System.Data.DataColumn("PzPallet", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnPzPallet);
+ this.columnOperSetup = new global::System.Data.DataColumn("OperSetup", typeof(string), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnOperSetup);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnIdxODL}, true));
this.columnIdxODL.AutoIncrement = true;
@@ -1771,6 +1786,8 @@ namespace MapoDb {
this.columnCommessaAs400.AllowDBNull = false;
this.columnCommessaAs400.MaxLength = 50;
this.columnPzPallet.AllowDBNull = false;
+ this.columnOperSetup.ReadOnly = true;
+ this.columnOperSetup.MaxLength = 101;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -10116,6 +10133,22 @@ namespace MapoDb {
}
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+ public string OperSetup {
+ get {
+ try {
+ return ((string)(this[this.tableODL.OperSetupColumn]));
+ }
+ catch (global::System.InvalidCastException e) {
+ throw new global::System.Data.StrongTypingException("Il valore della colonna \'OperSetup\' nella tabella \'ODL\' è DBNull.", e);
+ }
+ }
+ set {
+ this[this.tableODL.OperSetupColumn] = value;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsIdxMacchinaNull() {
@@ -10235,6 +10268,18 @@ namespace MapoDb {
public void SetTCRichAttrNull() {
this[this.tableODL.TCRichAttrColumn] = global::System.Convert.DBNull;
}
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+ public bool IsOperSetupNull() {
+ return this.IsNull(this.tableODL.OperSetupColumn);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+ public void SetOperSetupNull() {
+ this[this.tableODL.OperSetupColumn] = global::System.Convert.DBNull;
+ }
}
///
@@ -16244,6 +16289,7 @@ SELECT IdxMacchina, CodArticolo, DataOraRif, TCMedio, PzProd FROM TempiCicloRile
tableMapping.ColumnMappings.Add("ToAs400", "ToAs400");
tableMapping.ColumnMappings.Add("CommessaAs400", "CommessaAs400");
tableMapping.ColumnMappings.Add("PzPallet", "PzPallet");
+ tableMapping.ColumnMappings.Add("OperSetup", "OperSetup");
this._adapter.TableMappings.Add(tableMapping);
}