diff --git a/GMW/GMW.csproj b/GMW/GMW.csproj index 569ef927..ee4cfdab 100644 --- a/GMW/GMW.csproj +++ b/GMW/GMW.csproj @@ -400,9 +400,13 @@ + + + + @@ -675,6 +679,13 @@ odette.aspx + + PostProveMecc.aspx + ASPXCodeBehind + + + PostProveMecc.aspx + PostRX.aspx ASPXCodeBehind @@ -689,6 +700,13 @@ PostRX_DT.aspx + + PostTT.aspx + ASPXCodeBehind + + + PostTT.aspx + POST_PRE_TT.aspx ASPXCodeBehind @@ -1278,6 +1296,13 @@ mod_periodoAnalisi.ascx + + mod_PostProveMecc.ascx + ASPXCodeBehind + + + mod_PostProveMecc.ascx + mod_PostRX_DT.ascx ASPXCodeBehind @@ -1292,6 +1317,13 @@ mod_PostRX_NT.ascx + + mod_PostTT.ascx + ASPXCodeBehind + + + mod_PostTT.ascx + mod_PostTT_Pre_DT.ascx ASPXCodeBehind diff --git a/GMW/PostProveMecc.aspx b/GMW/PostProveMecc.aspx new file mode 100644 index 00000000..e020f85d --- /dev/null +++ b/GMW/PostProveMecc.aspx @@ -0,0 +1,10 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" CodeBehind="PostProveMecc.aspx.cs" Inherits="GMW.PostProveMecc" %> + +<%@ Register Src="WebUserControls/mod_PostProveMecc.ascx" TagName="mod_PostProveMecc" TagPrefix="uc1" %> + + + + + + + diff --git a/GMW/PostProveMecc.aspx.cs b/GMW/PostProveMecc.aspx.cs new file mode 100644 index 00000000..8b15fc53 --- /dev/null +++ b/GMW/PostProveMecc.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace GMW +{ + public partial class PostProveMecc : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/GMW/PostProveMecc.aspx.designer.cs b/GMW/PostProveMecc.aspx.designer.cs new file mode 100644 index 00000000..c622ecc7 --- /dev/null +++ b/GMW/PostProveMecc.aspx.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GMW { + + + public partial class PostProveMecc { + + /// + /// mod_PostProveMecc1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW.WebUserControls.mod_PostProveMecc mod_PostProveMecc1; + } +} diff --git a/GMW/PostTT.aspx b/GMW/PostTT.aspx new file mode 100644 index 00000000..358fc9b1 --- /dev/null +++ b/GMW/PostTT.aspx @@ -0,0 +1,39 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" CodeBehind="PostTT.aspx.cs" Inherits="GMW.PostTT" %> + +<%@ Register Src="WebUserControls/mod_selLineaNtDt.ascx" TagName="mod_selLineaNtDt" TagPrefix="uc1" %> +<%@ Register Src="WebUserControls/mod_storicoAzioniOperatore.ascx" TagName="mod_storicoAzioniOperatore" TagPrefix="uc2" %> +<%@ Register Src="WebUserControls/mod_PostTT.ascx" TagName="mod_PostTT" TagPrefix="uc3" %> + + + + + + + + +
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+ + diff --git a/GMW/PostTT.aspx.cs b/GMW/PostTT.aspx.cs new file mode 100644 index 00000000..4aadcdb8 --- /dev/null +++ b/GMW/PostTT.aspx.cs @@ -0,0 +1,141 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; +using GMW_data; + +namespace GMW +{ + public partial class PostTT : System.Web.UI.Page + { + /// + /// caricamento pagina! + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + updatePrinterPostazione(); + // fix css... + Postazione.CssClass = "stileAttesa"; + // imposto pos abilitata x cancellazione + mod_storicoAzioniOperatore1.idxPosizione2del = memLayer.ML.confReadInt("IdxPosizioneTT"); + } + // update vari... + doUpdate(); + mod_storicoAzioniOperatore1.eh_stampa += new EventHandler(mod_storicoAzioniOperatore1_eh_stampa); +#if false + mod_PostTT_Pre_NT1.doUpdate(); + mod_PostTT_Pre_NT1.eh_reqUpdate += mod_PostTT_Pre_NT1_eh_reqUpdate; +#endif + mod_selLineaNtDt1.eh_lineSelected += mod_selLineaNtDt1_eh_doRefresh; + mod_selLineaNtDt1.eh_showHideStorico += mod_selLineaNtDt1_eh_showHideStorico; + } + /// + /// Handles the showHideStorico event of the mod_selLineaNtDt1_eh control. + /// + /// The source of the event. + /// The instance containing the event data. + private void mod_selLineaNtDt1_eh_showHideStorico(object sender, EventArgs e) + { + fixStorico(); + } + /// + /// Handles the doRefresh event of the mod_selLineaNtDt1_eh control. + /// + /// The source of the event. + /// The instance containing the event data. + private void mod_selLineaNtDt1_eh_doRefresh(object sender, EventArgs e) + { + doUpdate(); +#if false + mod_PostTT_Pre_NT1.doUpdate(); +#endif + } + /// + /// richiesta update del controllo SAO + /// + /// + /// + void mod_PostTT_Pre_NT1_eh_reqUpdate(object sender, EventArgs e) + { + doUpdate(); + } + /// + /// aggiorna messaggi e css + /// + private void updateMessCss() + { + lblWarning.Text = Postazione.warningText; + lblMessaggi.Text = Postazione.messaggiText; + pnlAll.CssClass = Postazione.CssClass; + } + /// + /// richiesta (ri)stampa UDC + /// + /// + /// + void mod_storicoAzioniOperatore1_eh_stampa(object sender, EventArgs e) + { +#if false + mod_PostTT_Pre_NT1.ristampa(); +#endif + } + /// + /// sistemo visualizzazione pannelli + /// + private void fixPanels() + { + // default: moduli NON visibili SE non ho linea indicata.. + bool enableBtn = false; + if (Postazione.currCodCella != "") enableBtn = true; +#if false + mod_PostTT_Pre_NT1.Visible = enableBtn; +#endif + fixStorico(); + } + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(object lemma) + { + return user_std.UtSn.Traduci(lemma.ToString()); + } + /// + /// toggle controllo storico + /// + private void fixStorico() + { + pnlSAO.Visible = Postazione.showStorico; + } + /// + /// update generale controlli + /// + private void doUpdate() + { + updateMessCss(); + fixPanels(); + mod_storicoAzioniOperatore1.doUpdate(); + } + /// + /// calcola postazione corrente (ip, name, printer) + /// + private void updatePrinterPostazione() + { + Postazione.IP = Request.UserHostName; + Postazione.setupPrinter(); + // mostro warning se postazione non configurata... + if (Postazione.printer == "n.d.") + { + lblWarning.Text = traduci("lblWarnPostNonConf"); + } + } + } +} \ No newline at end of file diff --git a/GMW/PostTT.aspx.designer.cs b/GMW/PostTT.aspx.designer.cs new file mode 100644 index 00000000..7cd15f46 --- /dev/null +++ b/GMW/PostTT.aspx.designer.cs @@ -0,0 +1,78 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GMW { + + + public partial class PostTT { + + /// + /// mod_selLineaNtDt1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW.WebUserControls.mod_selLineaNtDt mod_selLineaNtDt1; + + /// + /// pnlAll control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlAll; + + /// + /// pnlSAO control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlSAO; + + /// + /// mod_storicoAzioniOperatore1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW.WebUserControls.mod_storicoAzioniOperatore mod_storicoAzioniOperatore1; + + /// + /// lblMessaggi control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblMessaggi; + + /// + /// lblWarning control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblWarning; + + /// + /// mod_PostTT1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW.WebUserControls.mod_PostTT mod_PostTT1; + } +} diff --git a/GMW/WebUserControls/mod_PostProveMecc.ascx b/GMW/WebUserControls/mod_PostProveMecc.ascx new file mode 100644 index 00000000..c41a71a4 --- /dev/null +++ b/GMW/WebUserControls/mod_PostProveMecc.ascx @@ -0,0 +1,4 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_PostProveMecc.ascx.cs" Inherits="GMW.WebUserControls.mod_PostProveMecc" %> + + +PROVE MECCANICHE \ No newline at end of file diff --git a/GMW/WebUserControls/mod_PostProveMecc.ascx.cs b/GMW/WebUserControls/mod_PostProveMecc.ascx.cs new file mode 100644 index 00000000..8811d42b --- /dev/null +++ b/GMW/WebUserControls/mod_PostProveMecc.ascx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace GMW.WebUserControls +{ + public partial class mod_PostProveMecc : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/GMW/WebUserControls/mod_PostProveMecc.ascx.designer.cs b/GMW/WebUserControls/mod_PostProveMecc.ascx.designer.cs new file mode 100644 index 00000000..06e69e70 --- /dev/null +++ b/GMW/WebUserControls/mod_PostProveMecc.ascx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GMW.WebUserControls +{ + + + public partial class mod_PostProveMecc + { + } +} diff --git a/GMW/WebUserControls/mod_PostTT.ascx b/GMW/WebUserControls/mod_PostTT.ascx new file mode 100644 index 00000000..72da45a3 --- /dev/null +++ b/GMW/WebUserControls/mod_PostTT.ascx @@ -0,0 +1,4 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_PostTT.ascx.cs" Inherits="GMW.WebUserControls.mod_PostTT" %> + + +POST TT \ No newline at end of file diff --git a/GMW/WebUserControls/mod_PostTT.ascx.cs b/GMW/WebUserControls/mod_PostTT.ascx.cs new file mode 100644 index 00000000..3e43f765 --- /dev/null +++ b/GMW/WebUserControls/mod_PostTT.ascx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace GMW.WebUserControls +{ + public partial class mod_PostTT : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/GMW/WebUserControls/mod_PostTT.ascx.designer.cs b/GMW/WebUserControls/mod_PostTT.ascx.designer.cs new file mode 100644 index 00000000..08d70634 --- /dev/null +++ b/GMW/WebUserControls/mod_PostTT.ascx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GMW.WebUserControls +{ + + + public partial class mod_PostTT + { + } +} diff --git a/GMW/WebUserControls/mod_selLineaNtDt.ascx.cs b/GMW/WebUserControls/mod_selLineaNtDt.ascx.cs index 3c537e90..5bfaa3c5 100644 --- a/GMW/WebUserControls/mod_selLineaNtDt.ascx.cs +++ b/GMW/WebUserControls/mod_selLineaNtDt.ascx.cs @@ -365,5 +365,34 @@ namespace GMW.WebUserControls // ricarico elenco postazioni... ddlLinea.DataBind(); } + /// + /// definisce visibilità selettore linea... + /// + public bool showSelPostazione + { + get + { + return ddlLinea.Visible; + } + set + { + ddlLinea.Visible = value; + } + } + /// + /// determina visibilità selettori NT/DT + /// + public bool showSelNtDt + { + get + { + return lbtDT.Visible; + } + set + { + lbtDT.Visible = value; + lbtNT.Visible = value; + } + } } } \ No newline at end of file diff --git a/GMW/WebUserControls/mod_storicoAzioniOperatore.ascx.cs b/GMW/WebUserControls/mod_storicoAzioniOperatore.ascx.cs index f5b73e26..ad75d961 100644 --- a/GMW/WebUserControls/mod_storicoAzioniOperatore.ascx.cs +++ b/GMW/WebUserControls/mod_storicoAzioniOperatore.ascx.cs @@ -44,7 +44,7 @@ namespace GMW.WebUserControls /// private void setBtnState() { - btnElimina.Visible = memLayer.ML.confReadBool("userCanDelUdc"); + btnElimina.Visible = memLayer.ML.confReadBool("userCanDelUdc") && showDelete; bool abilita = false; string css = "btn btn-default disabled"; if (idxEvento > 0 && udcSel != "") @@ -297,6 +297,9 @@ namespace GMW.WebUserControls { return user_std.UtSn.Traduci(lemma.ToString()); } - + /// + /// definisce se visualizzare o meno btn elimina + /// + public bool showDelete { get; set; } } } \ No newline at end of file diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index 472bced9..3b8fb594 100644 Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll index 86b60d6f..697b2d55 100644 Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll index 855c40e8..4910d027 100644 Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ diff --git a/GMW/bin/VersGen.dll b/GMW/bin/VersGen.dll index 770d4167..1437449b 100644 Binary files a/GMW/bin/VersGen.dll and b/GMW/bin/VersGen.dll differ diff --git a/GMW_DB/DbSnapshot/GMW.dacpac b/GMW_DB/DbSnapshot/GMW.dacpac index 0689ece9..6c0bd7e7 100644 Binary files a/GMW_DB/DbSnapshot/GMW.dacpac and b/GMW_DB/DbSnapshot/GMW.dacpac differ diff --git a/GMW_data/DS_magazzino.Designer.cs b/GMW_data/DS_magazzino.Designer.cs index d4f885c1..6367840c 100644 --- a/GMW_data/DS_magazzino.Designer.cs +++ b/GMW_data/DS_magazzino.Designer.cs @@ -38030,7 +38030,7 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start, [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start, C" + @@ -38044,7 +38044,7 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start, this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@AL", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = "dbo.stp_UAL_insertNewAL"; + this._commandCollection[2].CommandText = "dbo.stp_UAL_insertNewRX"; this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[2].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[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCS", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -38061,6 +38061,18 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start, this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodEvento", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@AL", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.InputOutput, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[3].Connection = this.Connection; + this._commandCollection[3].CommandText = "dbo.stp_UAL_insertNewTT"; + this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[3].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[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SourceAL", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TipoAl", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataCreaz", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.VarChar, 17, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodEvento", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@AL", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.InputOutput, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -38359,7 +38371,7 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start, [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual object insertNewAL(string CodCS, string Anno, string Cesta, string PostFlux, string Flusso, string TipoAl, global::System.Nullable DataCreaz, string CodSoggetto, string CodDtxStart, string CodDtxEnd, string CodCella, string CodEvento, string Note, ref string AL) { + public virtual object insertNewRX(string CodCS, string Anno, string Cesta, string PostFlux, string Flusso, string TipoAl, global::System.Nullable DataCreaz, string CodSoggetto, string CodDtxStart, string CodDtxEnd, string CodCella, string CodEvento, string Note, ref string AL) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; if ((CodCS == null)) { command.Parameters[1].Value = global::System.DBNull.Value; @@ -38474,6 +38486,83 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start, return ((object)(returnValue)); } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual object insertNewTT(string SourceAL, string TipoAl, global::System.Nullable DataCreaz, string CodSoggetto, string CodEvento, string Note, ref string AL) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; + if ((SourceAL == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(SourceAL)); + } + if ((TipoAl == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(TipoAl)); + } + if ((DataCreaz.HasValue == true)) { + command.Parameters[3].Value = ((System.DateTime)(DataCreaz.Value)); + } + else { + command.Parameters[3].Value = global::System.DBNull.Value; + } + if ((CodSoggetto == null)) { + command.Parameters[4].Value = global::System.DBNull.Value; + } + else { + command.Parameters[4].Value = ((string)(CodSoggetto)); + } + if ((CodEvento == null)) { + command.Parameters[5].Value = global::System.DBNull.Value; + } + else { + command.Parameters[5].Value = ((string)(CodEvento)); + } + if ((Note == null)) { + command.Parameters[6].Value = global::System.DBNull.Value; + } + else { + command.Parameters[6].Value = ((string)(Note)); + } + if ((AL == null)) { + command.Parameters[7].Value = global::System.DBNull.Value; + } + else { + command.Parameters[7].Value = ((string)(AL)); + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + object returnValue; + try { + returnValue = command.ExecuteScalar(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + if (((command.Parameters[7].Value == null) + || (command.Parameters[7].Value.GetType() == typeof(global::System.DBNull)))) { + AL = null; + } + else { + AL = ((string)(command.Parameters[7].Value)); + } + if (((returnValue == null) + || (returnValue.GetType() == typeof(global::System.DBNull)))) { + return null; + } + else { + return ((object)(returnValue)); + } + } } /// diff --git a/GMW_data/DS_magazzino.xsd b/GMW_data/DS_magazzino.xsd index 6968c0b4..371da39c 100644 --- a/GMW_data/DS_magazzino.xsd +++ b/GMW_data/DS_magazzino.xsd @@ -3591,10 +3591,10 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start, - + - dbo.stp_UAL_insertNewAL + dbo.stp_UAL_insertNewRX @@ -3615,6 +3615,23 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start, + + + + dbo.stp_UAL_insertNewTT + + + + + + + + + + + + + @@ -4816,7 +4833,7 @@ SELECT AL, UDC, DataCreaz, CodSoggetto FROM AL2UDC WHERE (AL = @AL) AND (UDC = @ - + @@ -4873,7 +4890,7 @@ SELECT AL, UDC, DataCreaz, CodSoggetto FROM AL2UDC WHERE (AL = @AL) AND (UDC = @ - + @@ -4905,7 +4922,7 @@ SELECT AL, UDC, DataCreaz, CodSoggetto FROM AL2UDC WHERE (AL = @AL) AND (UDC = @ - + @@ -4927,7 +4944,7 @@ SELECT AL, UDC, DataCreaz, CodSoggetto FROM AL2UDC WHERE (AL = @AL) AND (UDC = @ - + @@ -4954,7 +4971,7 @@ SELECT AL, UDC, DataCreaz, CodSoggetto FROM AL2UDC WHERE (AL = @AL) AND (UDC = @ - + @@ -4996,14 +5013,14 @@ SELECT AL, UDC, DataCreaz, CodSoggetto FROM AL2UDC WHERE (AL = @AL) AND (UDC = @ - + - + @@ -5039,7 +5056,7 @@ SELECT AL, UDC, DataCreaz, CodSoggetto FROM AL2UDC WHERE (AL = @AL) AND (UDC = @ - + @@ -5096,7 +5113,7 @@ SELECT AL, UDC, DataCreaz, CodSoggetto FROM AL2UDC WHERE (AL = @AL) AND (UDC = @ - + @@ -5281,20 +5298,20 @@ SELECT AL, UDC, DataCreaz, CodSoggetto FROM AL2UDC WHERE (AL = @AL) AND (UDC = @ - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GMW_data/DS_magazzino.xss b/GMW_data/DS_magazzino.xss index 5d9c681a..be107f56 100644 --- a/GMW_data/DS_magazzino.xss +++ b/GMW_data/DS_magazzino.xss @@ -4,16 +4,16 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + @@ -29,7 +29,7 @@ - + @@ -38,8 +38,8 @@ - - + + @@ -194,15 +194,15 @@ - + - -27 - 554 + -39 + 550 - -27 - 496 + -39 + 499 @@ -210,11 +210,11 @@ 87 - 333 + 336 - 47 - 333 + 52 + 336 diff --git a/GMW_data/MagClass.cs b/GMW_data/MagClass.cs index 22ccbb36..bb0e3b68 100644 --- a/GMW_data/MagClass.cs +++ b/GMW_data/MagClass.cs @@ -252,42 +252,6 @@ namespace GMW_data TipoAL = "R"; CodEvento = "UDC_RX"; break; - case tipoAL.AL_TtDt: - PostFlux = "TtDt"; - CodFlusso = "AT"; - TipoAL = "T"; - CodEvento = "UDC_TT_DT"; - // calcolo primo/ultimo dtx OK - try - { - DS_DataMatrix.stp_getFirstLastDtxRow rigaFirstLast = DataMatrix.mgr.taFirstLastUdc.GetData(CodCella)[0]; - if (!rigaFirstLast.IsNull(0)) - { - CodDtxStart = rigaFirstLast.DtxStart; - CodDtxEnd = rigaFirstLast.DtxEnd; - } - else - { - CodDtxStart = ""; - CodDtxEnd = ""; - } - } - catch - { - CodDtxStart = ""; - CodDtxEnd = ""; - } - break; - case tipoAL.AL_TtNt: - PostFlux = "TtNt"; - CodFlusso = "AT"; - TipoAL = "T"; - CodEvento = "UDC_TT"; - break; - case tipoAL.AL_LpDt: - break; - case tipoAL.AL_LpNt: - break; default: break; } @@ -304,16 +268,56 @@ namespace GMW_data // creo nuovo Assieme Logico ed associo UDC! try { - taEA.insertNewAL(CodCS, annoTrim, Cesta, PostFlux, CodFlusso, TipoAL, DataRif, CodSoggettoTrim, CodDtxStart, CodDtxEnd, CodCella, CodEvento, note, ref AL); + taEA.insertNewRX(CodCS, annoTrim, Cesta, PostFlux, CodFlusso, TipoAL, DataRif, CodSoggettoTrim, CodDtxStart, CodDtxEnd, CodCella, CodEvento, note, ref AL); } catch (Exception exc) { // loggo errore - logger.lg.scriviLog(string.Format("ERRORE CREAZIONE AL: | {0} | procedura stp_UAL_insertNewAL, parametri: {1} | {2} | {3} | {4} | {5} | {6} | {7} | {8} | {9} | {10} | {11} | {12} | {13} {0} {14}", Environment.NewLine, CodCS, annoTrim, Cesta, PostFlux, CodFlusso, TipoAL, DataRif, CodSoggettoTrim, CodDtxStart, CodDtxEnd, CodCella, CodEvento, note, exc), tipoLog.EXCEPTION); + logger.lg.scriviLog(string.Format("ERRORE CREAZIONE AL: {0} procedura stp_UAL_insertNewRX, parametri: {1} | {2} | {3} | {4} | {5} | {6} | {7} | {8} | {9} | {10} | {11} | {12} | {13} {0} {14}", Environment.NewLine, CodCS, annoTrim, Cesta, PostFlux, CodFlusso, TipoAL, DataRif, CodSoggettoTrim, CodDtxStart, CodDtxEnd, CodCella, CodEvento, note, exc), tipoLog.EXCEPTION); } return AL; } /// + /// Crea un nuovo AL di tipo TT a partire da uno RX e sistema di conseguenza UDC ed eventuali Dtx + /// + /// Codice AL RX sorgente + /// tipologia (T) + /// Operatore + /// Note + /// + public string creaAssociaAlTT(string SourceAL, tipoAL tipologia, string CodSoggetto, string note) + { + // imposto valori default + string TipoAL = ""; + string CodEvento = ""; + DateTime DataRif = DateTime.Now; + // trim fix + string CodSoggettoTrim = CodSoggetto.Trim(); + // out: codice AL... + string AL = "NA"; + switch (tipologia) + { + case tipoAL.AL_TtDt: + case tipoAL.AL_TtNt: + TipoAL = "T"; + CodEvento = "UDC_TRATT"; + break; + default: + break; + } + // creo nuovo Assieme Logico ed associo UDC! + try + { + taEA.insertNewTT(SourceAL, TipoAL, DataRif, CodSoggetto, CodEvento, note, ref AL); + } + catch (Exception exc) + { + // loggo errore + logger.lg.scriviLog(string.Format("ERRORE avanzamento AL TT: {0} procedura stp_UAL_insertNewTT, parametri: {1} | {2} | {3} | {4} | {5} | {6} | {0} {7}", Environment.NewLine, SourceAL, TipoAL, DataRif, CodSoggetto, CodEvento, note, exc), tipoLog.EXCEPTION); + } + return AL; + } + /// /// verifica se l'AL indicato sia valido, ovvero esistente /// /// @@ -371,7 +375,7 @@ namespace GMW_data } return answ; } - + #endregion #region operazioni su UDC @@ -479,7 +483,7 @@ namespace GMW_data { } return answ; } - /// + /// /// rettifica la qta di un UDC /// /// Codice UDC sorgente @@ -500,7 +504,7 @@ namespace GMW_data { } return answ; } - /// + /// /// verifica se l'UDC indicato sia valido, ovvero esistente /// /// diff --git a/VersGen/GMW.cs b/VersGen/GMW.cs index b1c1aafe..19231fd9 100644 --- a/VersGen/GMW.cs +++ b/VersGen/GMW.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.5.619.1532")] -[assembly: AssemblyFileVersion("2.5.619.1532")] +[assembly: AssemblyVersion("2.5.620.1533")] +[assembly: AssemblyFileVersion("2.5.620.1533")] //[assembly: AssemblyCopyright("© Steamware 2007-2014")] //[assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/GMW.tt b/VersGen/GMW.tt index 143442a8..2fcbdee4 100644 --- a/VersGen/GMW.tt +++ b/VersGen/GMW.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.5.619.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.5.619.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.5.620.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.5.620.<#= this.RevisionNumber #>")] //[assembly: AssemblyCopyright("© Steamware 2007-<#= DateTime.Now.Year #>")] //[assembly: AssemblyCompany("Steamware")] <#+