diff --git a/Jenkinsfile b/Jenkinsfile index cac738ff..238baf8f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=939']) { + withEnv(['NEXT_BUILD_NUMBER=940']) { // 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-TAB/MP-TAB.csproj b/MP-TAB/MP-TAB.csproj index 95967276..18c2c5e9 100644 --- a/MP-TAB/MP-TAB.csproj +++ b/MP-TAB/MP-TAB.csproj @@ -21,11 +21,9 @@ 4.0 - 44384 - - - - + 44328 + enabled + disabled @@ -513,6 +511,7 @@ Web.config + @@ -751,6 +750,13 @@ cmp_newODL.ascx + + cmp_selPzPallet.ascx + ASPXCodeBehind + + + cmp_selPzPallet.ascx + mod_checkHttps.ascx ASPXCodeBehind diff --git a/MP-TAB/WebUserControls/cmp_selPzPallet.ascx b/MP-TAB/WebUserControls/cmp_selPzPallet.ascx new file mode 100644 index 00000000..2a3de669 --- /dev/null +++ b/MP-TAB/WebUserControls/cmp_selPzPallet.ascx @@ -0,0 +1,18 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_selPzPallet.ascx.cs" Inherits="MoonProTablet.WebUserControls.cmp_selPzPallet" %> + + + +
+
+ Num pezzi/pallet +
+
+ + + + + + + +
+
diff --git a/MP-TAB/WebUserControls/cmp_selPzPallet.ascx.cs b/MP-TAB/WebUserControls/cmp_selPzPallet.ascx.cs new file mode 100644 index 00000000..fae4f18c --- /dev/null +++ b/MP-TAB/WebUserControls/cmp_selPzPallet.ascx.cs @@ -0,0 +1,51 @@ +using SteamWare; +using System; + +namespace MoonProTablet.WebUserControls +{ + public partial class cmp_selPzPallet : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + /// + /// Valore PzPallet selezionato + /// + public int pzPallet + { + get + { + int answ = 1; + // provo a recuperare pz Pallet + int.TryParse(ddlPzPallet.SelectedValue, out answ); + return answ; + } + set + { + try + { + ddlPzPallet.SelectedValue = value.ToString(); + } + catch (Exception exc) + { + logger.lg.scriviLog(string.Format("Errore in assegnazione pz pallet ({0}){1}{2}", value, Environment.NewLine, exc), tipoLog.EXCEPTION); + } + } + } + /// + /// Imposta abilitazione alla modifica + /// + public bool enableSet + { + get + { + return ddlPzPallet.Enabled; + } + set + { + ddlPzPallet.Enabled = value; + } + } + } +} \ No newline at end of file diff --git a/MP-TAB/WebUserControls/cmp_selPzPallet.ascx.designer.cs b/MP-TAB/WebUserControls/cmp_selPzPallet.ascx.designer.cs new file mode 100644 index 00000000..16d0aab9 --- /dev/null +++ b/MP-TAB/WebUserControls/cmp_selPzPallet.ascx.designer.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace MoonProTablet.WebUserControls { + + + public partial class cmp_selPzPallet { + + /// + /// Controllo ddlPzPallet. + /// + /// + /// 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.DropDownList ddlPzPallet; + + /// + /// Controllo odsPzPallet. + /// + /// + /// 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 odsPzPallet; + } +} diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx b/MP-TAB/WebUserControls/mod_ODL.ascx index bfc0cd26..c49228dc 100644 --- a/MP-TAB/WebUserControls/mod_ODL.ascx +++ b/MP-TAB/WebUserControls/mod_ODL.ascx @@ -1,6 +1,8 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_ODL.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_ODL" %> <%@ Register Src="~/WebUserControls/mod_tempoMSMC.ascx" TagPrefix="uc1" TagName="mod_tempoMSMC" %> <%@ Register Src="~/WebUserControls/cmp_newODL.ascx" TagPrefix="uc1" TagName="cmp_newODL" %> +<%@ Register Src="~/WebUserControls/cmp_selPzPallet.ascx" TagPrefix="uc1" TagName="cmp_selPzPallet" %> +
@@ -57,6 +59,9 @@
+
+ +
diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs index ff6c16c8..239a6725 100644 --- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs +++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs @@ -301,6 +301,27 @@ namespace MoonProTablet.WebUserControls } } /// + /// valore INT di num Pz per Pallet... + /// + protected int PzPallet + { + get + { + int answ = 0; + try + { + answ = cmp_selPzPallet.pzPallet; + } + catch + { } + return answ; + } + set + { + cmp_selPzPallet.pzPallet = value; + } + } + /// /// valore decimal del TC ASSEGNATO... /// protected decimal TCAssegnato(int idxODL) @@ -353,7 +374,7 @@ namespace MoonProTablet.WebUserControls if (enableRPO) { // creo nuovo ODL da promessa ed associo - DataLayer.obj.taODL.inizioSetupPromessa(idxODLSel, DataLayer.MatrOpr, idxMacchina, TCRichAttr, txtNote.Text); + DataLayer.obj.taODL.inizioSetupPromessa(idxODLSel, DataLayer.MatrOpr, idxMacchina, TCRichAttr, PzPallet, txtNote.Text); // salvo ODL attrezzato idxODL_curr = DataLayer.obj.taODL.getByMacchina(idxMacchina)[0].IdxODL; } @@ -361,7 +382,7 @@ namespace MoonProTablet.WebUserControls else { // avvio NUOVO ODL - DataLayer.obj.taODL.inizioSetup(idxODLSel, DataLayer.MatrOpr, idxMacchina, TCRichAttr, txtNote.Text); + DataLayer.obj.taODL.inizioSetup(idxODLSel, DataLayer.MatrOpr, idxMacchina, TCRichAttr, PzPallet, txtNote.Text); // salvo ODL Current idxODL_curr = idxODLSel; } @@ -396,8 +417,8 @@ namespace MoonProTablet.WebUserControls // leggo idxOdl da ultimo odl attivo x macchina int idxODL = DataLayer.obj.taODL.getByMacchina(idxMacchina)[0].IdxODL; int idxEvento = 1; // !!!HARD CODED - // aggiorno (se necessario) note e tempo setup - DataLayer.obj.taODL.updateSetup(idxODL, DataLayer.MatrOpr, TCRichAttr, txtNote.Text); + // aggiorno (se necessario) note e tempo setup + DataLayer.obj.taODL.updateSetup(idxODL, DataLayer.MatrOpr, TCRichAttr, PzPallet, txtNote.Text); // controllo se TC Assegnato != TCRichiesto allora invio email x verifiche... DS_ProdTempi.ODLRow rigaOdl = DataLayer.obj.taODL.getByIdx(idxODL, false)[0]; if (rigaOdl.TCAssegnato != TCRichAttr) @@ -574,6 +595,7 @@ namespace MoonProTablet.WebUserControls } } + /// /// mostra/nasconde note /// @@ -582,6 +604,10 @@ namespace MoonProTablet.WebUserControls // mostra/nasconde note da compilare divTempo.Visible = show; divNote.Visible = show; + divPzPallet.Visible = show; + // se abilitato da config su DB mostro selezione del numPzPallet... + cmp_selPzPallet.enableSet = memLayer.ML.CRB("enableTabSetPzPallet"); + } /// /// aggiorna note ODL @@ -609,26 +635,30 @@ namespace MoonProTablet.WebUserControls private void updateTempoTc(int idxOdl) { // riporta TC - decimal TCRichAttr = 0; + decimal _TCRichAttr = 0; + int pzPallet = 1; if (enableRPO) { var rigaProm = DataLayer.obj.taPODL.getByKey(idxOdl)[0]; - TCRichAttr = rigaProm.TCAssegnato; + _TCRichAttr = rigaProm.TCAssegnato; + pzPallet = rigaProm.PzPallet; } else { DS_ProdTempi.ODLRow rigaOdl = DataLayer.obj.taODL.getByIdx(idxOdl, false)[0]; if (rigaOdl.TCRichAttr > 0) { - TCRichAttr = rigaOdl.TCRichAttr; + _TCRichAttr = rigaOdl.TCRichAttr; } else { - TCRichAttr = rigaOdl.TCAssegnato; + _TCRichAttr = rigaOdl.TCAssegnato; } + pzPallet = rigaOdl.PzPallet; } - // mostro! - mod_tempoMSMC.tempoMC = TCRichAttr; + // aggiorno dati! + TCRichAttr = _TCRichAttr; + PzPallet = pzPallet; } protected void lbtConfNewRevProd_Click(object sender, EventArgs e) diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.designer.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.designer.cs index 76a19115..f65de884 100644 --- a/MP-TAB/WebUserControls/mod_ODL.ascx.designer.cs +++ b/MP-TAB/WebUserControls/mod_ODL.ascx.designer.cs @@ -120,6 +120,24 @@ namespace MoonProTablet.WebUserControls { /// protected global::MoonProTablet.WebUserControls.mod_tempoMSMC mod_tempoMSMC; + /// + /// Controllo divPzPallet. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divPzPallet; + + /// + /// Controllo cmp_selPzPallet. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MoonProTablet.WebUserControls.cmp_selPzPallet cmp_selPzPallet; + /// /// Controllo lbtStartProd. /// diff --git a/MapoDb/DS_ProdTempi.Designer.cs b/MapoDb/DS_ProdTempi.Designer.cs index 94765b23..0b82f89e 100644 --- a/MapoDb/DS_ProdTempi.Designer.cs +++ b/MapoDb/DS_ProdTempi.Designer.cs @@ -17367,6 +17367,7 @@ SELECT IdxMacchina, CodArticolo, DataOraRif, TCMedio, PzProd FROM TempiCicloRile this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MatrOpr", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxMacchina", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TCRichAttr", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 8, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PzPallet", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 2500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[13] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[13].Connection = this.Connection; @@ -17377,6 +17378,7 @@ SELECT IdxMacchina, CodArticolo, DataOraRif, TCMedio, PzProd FROM TempiCicloRile this._commandCollection[13].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MatrOpr", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[13].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxMacchina", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[13].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TCRichAttr", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 8, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[13].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PzPallet", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[13].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 2500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[14] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[14].Connection = this.Connection; @@ -17451,6 +17453,7 @@ SELECT IdxMacchina, CodArticolo, DataOraRif, TCMedio, PzProd FROM TempiCicloRile this._commandCollection[20].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxODL", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[20].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MatrOpr", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[20].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TCRichAttr", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 8, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[20].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PzPallet", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[20].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 2500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -17756,7 +17759,7 @@ SELECT IdxMacchina, CodArticolo, DataOraRif, TCMedio, PzProd FROM TempiCicloRile [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 inizioSetup(global::System.Nullable idxODL, global::System.Nullable MatrOpr, string IdxMacchina, global::System.Nullable TCRichAttr, string Note) { + public virtual int inizioSetup(global::System.Nullable idxODL, global::System.Nullable MatrOpr, string IdxMacchina, global::System.Nullable TCRichAttr, global::System.Nullable PzPallet, string Note) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[12]; if ((idxODL.HasValue == true)) { command.Parameters[1].Value = ((int)(idxODL.Value)); @@ -17782,11 +17785,17 @@ SELECT IdxMacchina, CodArticolo, DataOraRif, TCMedio, PzProd FROM TempiCicloRile else { command.Parameters[4].Value = global::System.DBNull.Value; } - if ((Note == null)) { - command.Parameters[5].Value = global::System.DBNull.Value; + if ((PzPallet.HasValue == true)) { + command.Parameters[5].Value = ((int)(PzPallet.Value)); } else { - command.Parameters[5].Value = ((string)(Note)); + command.Parameters[5].Value = global::System.DBNull.Value; + } + if ((Note == null)) { + command.Parameters[6].Value = global::System.DBNull.Value; + } + else { + command.Parameters[6].Value = ((string)(Note)); } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) @@ -17808,7 +17817,7 @@ SELECT IdxMacchina, CodArticolo, DataOraRif, TCMedio, PzProd FROM TempiCicloRile [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 inizioSetupPromessa(global::System.Nullable idxPromessa, global::System.Nullable MatrOpr, string IdxMacchina, global::System.Nullable TCRichAttr, string Note) { + public virtual int inizioSetupPromessa(global::System.Nullable idxPromessa, global::System.Nullable MatrOpr, string IdxMacchina, global::System.Nullable TCRichAttr, global::System.Nullable PzPallet, string Note) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[13]; if ((idxPromessa.HasValue == true)) { command.Parameters[1].Value = ((int)(idxPromessa.Value)); @@ -17834,11 +17843,17 @@ SELECT IdxMacchina, CodArticolo, DataOraRif, TCMedio, PzProd FROM TempiCicloRile else { command.Parameters[4].Value = global::System.DBNull.Value; } - if ((Note == null)) { - command.Parameters[5].Value = global::System.DBNull.Value; + if ((PzPallet.HasValue == true)) { + command.Parameters[5].Value = ((int)(PzPallet.Value)); } else { - command.Parameters[5].Value = ((string)(Note)); + command.Parameters[5].Value = global::System.DBNull.Value; + } + if ((Note == null)) { + command.Parameters[6].Value = global::System.DBNull.Value; + } + else { + command.Parameters[6].Value = ((string)(Note)); } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) @@ -18204,7 +18219,7 @@ SELECT IdxMacchina, CodArticolo, DataOraRif, TCMedio, PzProd FROM TempiCicloRile [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 updateSetup(global::System.Nullable idxODL, global::System.Nullable MatrOpr, global::System.Nullable TCRichAttr, string Note) { + public virtual int updateSetup(global::System.Nullable idxODL, global::System.Nullable MatrOpr, global::System.Nullable TCRichAttr, global::System.Nullable PzPallet, string Note) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[20]; if ((idxODL.HasValue == true)) { command.Parameters[1].Value = ((int)(idxODL.Value)); @@ -18224,11 +18239,17 @@ SELECT IdxMacchina, CodArticolo, DataOraRif, TCMedio, PzProd FROM TempiCicloRile else { command.Parameters[3].Value = global::System.DBNull.Value; } - if ((Note == null)) { - command.Parameters[4].Value = global::System.DBNull.Value; + if ((PzPallet.HasValue == true)) { + command.Parameters[4].Value = ((int)(PzPallet.Value)); } else { - command.Parameters[4].Value = ((string)(Note)); + command.Parameters[4].Value = global::System.DBNull.Value; + } + if ((Note == null)) { + command.Parameters[5].Value = global::System.DBNull.Value; + } + else { + command.Parameters[5].Value = ((string)(Note)); } 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 30570ec6..f79960b1 100644 --- a/MapoDb/DS_ProdTempi.xsd +++ b/MapoDb/DS_ProdTempi.xsd @@ -324,6 +324,7 @@ ORDER BY idxODL DESC + @@ -339,6 +340,7 @@ ORDER BY idxODL DESC + @@ -448,6 +450,7 @@ ORDER BY idxODL DESC + @@ -2685,7 +2688,7 @@ FROM v_ECP - + @@ -2766,7 +2769,7 @@ FROM v_ECP - + @@ -2795,7 +2798,7 @@ FROM v_ECP - + @@ -2807,7 +2810,7 @@ FROM v_ECP - + @@ -2832,7 +2835,7 @@ FROM v_ECP - + @@ -2870,7 +2873,7 @@ FROM v_ECP - + @@ -2909,7 +2912,7 @@ FROM v_ECP - + @@ -2975,7 +2978,7 @@ FROM v_ECP - + @@ -2997,7 +3000,7 @@ FROM v_ECP - + @@ -3067,7 +3070,7 @@ FROM v_ECP - + diff --git a/MapoDb/DS_ProdTempi.xss b/MapoDb/DS_ProdTempi.xss index 8aeef7a3..2da98b8f 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