diff --git a/Jenkinsfile b/Jenkinsfile
index e4a5fa37..517f80ec 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=863']) {
+ withEnv(['NEXT_BUILD_NUMBER=864']) {
// 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_anagArticoli.ascx b/MP-Admin/WebUserControls/mod_anagArticoli.ascx
index ab87c5d3..c47cf205 100644
--- a/MP-Admin/WebUserControls/mod_anagArticoli.ascx
+++ b/MP-Admin/WebUserControls/mod_anagArticoli.ascx
@@ -127,9 +127,11 @@
-
-
+
+
+
+
diff --git a/MapoDb/DS_ProdTempi.Designer.cs b/MapoDb/DS_ProdTempi.Designer.cs
index 021d448e..10431800 100644
--- a/MapoDb/DS_ProdTempi.Designer.cs
+++ b/MapoDb/DS_ProdTempi.Designer.cs
@@ -18467,9 +18467,10 @@ SELECT CodArticolo, Disegno, DescArticolo, CurrRev, ProdRev, FlagIsNew, Tipo FRO
this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodArticolo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodArticolo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DescArticolo", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CurrRev", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodArticolo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Disegno", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Tipo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
@@ -18880,7 +18881,7 @@ SELECT CodArticolo, Disegno, DescArticolo, CurrRev, ProdRev, FlagIsNew, Tipo FRO
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
- public virtual int updateQry(string Original_CodArticolo, string CodArticolo, string DescArticolo, string CurrRev, string Tipo) {
+ public virtual int updateQry(string Original_CodArticolo, string DescArticolo, string CurrRev, string CodArticolo, string Disegno, string Tipo) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5];
if ((Original_CodArticolo == null)) {
command.Parameters[1].Value = global::System.DBNull.Value;
@@ -18888,29 +18889,35 @@ SELECT CodArticolo, Disegno, DescArticolo, CurrRev, ProdRev, FlagIsNew, Tipo FRO
else {
command.Parameters[1].Value = ((string)(Original_CodArticolo));
}
- if ((CodArticolo == null)) {
+ if ((DescArticolo == null)) {
command.Parameters[2].Value = global::System.DBNull.Value;
}
else {
- command.Parameters[2].Value = ((string)(CodArticolo));
+ command.Parameters[2].Value = ((string)(DescArticolo));
}
- if ((DescArticolo == null)) {
+ if ((CurrRev == null)) {
command.Parameters[3].Value = global::System.DBNull.Value;
}
else {
- command.Parameters[3].Value = ((string)(DescArticolo));
+ command.Parameters[3].Value = ((string)(CurrRev));
}
- if ((CurrRev == null)) {
+ if ((CodArticolo == null)) {
command.Parameters[4].Value = global::System.DBNull.Value;
}
else {
- command.Parameters[4].Value = ((string)(CurrRev));
+ command.Parameters[4].Value = ((string)(CodArticolo));
}
- if ((Tipo == null)) {
+ if ((Disegno == null)) {
command.Parameters[5].Value = global::System.DBNull.Value;
}
else {
- command.Parameters[5].Value = ((string)(Tipo));
+ command.Parameters[5].Value = ((string)(Disegno));
+ }
+ if ((Tipo == null)) {
+ command.Parameters[6].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[6].Value = ((string)(Tipo));
}
global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
if (((command.Connection.State & global::System.Data.ConnectionState.Open)
diff --git a/MapoDb/DS_ProdTempi.xsd b/MapoDb/DS_ProdTempi.xsd
index b99c8e7f..5fc2c5dd 100644
--- a/MapoDb/DS_ProdTempi.xsd
+++ b/MapoDb/DS_ProdTempi.xsd
@@ -579,9 +579,10 @@ SELECT CodArticolo, Disegno, DescArticolo, CurrRev, ProdRev, FlagIsNew, Tipo FRO
-
+
+
@@ -2660,7 +2661,7 @@ FROM v_ECP
-
+
@@ -2741,7 +2742,7 @@ FROM v_ECP
-
+
@@ -2770,7 +2771,7 @@ FROM v_ECP
-
+
@@ -2782,7 +2783,7 @@ FROM v_ECP
-
+
@@ -2807,7 +2808,7 @@ FROM v_ECP
-
+
@@ -2845,7 +2846,7 @@ FROM v_ECP
-
+
@@ -2884,7 +2885,7 @@ FROM v_ECP
-
+
@@ -2950,7 +2951,7 @@ FROM v_ECP
-
+
@@ -2972,7 +2973,7 @@ FROM v_ECP
-
+
@@ -3042,7 +3043,7 @@ FROM v_ECP
-
+
diff --git a/MapoDb/DS_ProdTempi.xss b/MapoDb/DS_ProdTempi.xss
index ec007410..bb5e1d12 100644
--- a/MapoDb/DS_ProdTempi.xss
+++ b/MapoDb/DS_ProdTempi.xss
@@ -4,32 +4,32 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
-->
-
+
-
+
-
+
-
-
+
+
-
+
-
-
-
+
+
+
-
-
+
+
\ No newline at end of file