diff --git a/GMW/GMW.suo b/GMW/GMW.suo index c10ce0db..9c650728 100644 Binary files a/GMW/GMW.suo and b/GMW/GMW.suo differ diff --git a/GMW/GMW/WS/AutoCompletamento.asmx.cs b/GMW/GMW/WS/AutoCompletamento.asmx.cs index b7fc874e..c0346ae0 100644 --- a/GMW/GMW/WS/AutoCompletamento.asmx.cs +++ b/GMW/GMW/WS/AutoCompletamento.asmx.cs @@ -38,5 +38,23 @@ namespace GMW.WS return suggerimenti.ToArray(); } + [System.Web.Services.WebMethod] + public string[] elencoCelle(string prefixText, int count) + { + // inizializzo risposta + List suggerimenti = new List(); + // proseguo SOLO SE min "MinCharAutocomplete" char... + if (count > memLayer.ML.confReadInt("MinCharAutocomplete")) + { + // elenco candidati + DS_magazzino.CelleDataTable tabCelle = MagClass.magazzino.taCelle.getByCodCellaLike(prefixText, memLayer.ML.confReadString("CodCS")); + // aggiungo ogni riga... + foreach (DS_magazzino.CelleRow riga in tabCelle) + { + suggerimenti.Add(riga.CodCella); + } + } + return suggerimenti.ToArray(); + } } } diff --git a/GMW/GMW/WebUserControls/mod_UdcCella.ascx b/GMW/GMW/WebUserControls/mod_UdcCella.ascx index 3e18438c..5ab7616a 100644 --- a/GMW/GMW/WebUserControls/mod_UdcCella.ascx +++ b/GMW/GMW/WebUserControls/mod_UdcCella.ascx @@ -1,53 +1,113 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_UdcCella.ascx.cs" Inherits="GMW.WebUserControls.mod_UdcCella" %> - - - - - - - - - - - - - - - - - +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_UdcCella.ascx.cs" + Inherits="GMW.WebUserControls.mod_UdcCella" %> +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- - + - - - - - - - - - - - - - - - - - - - - - - - -   - \ No newline at end of file + --%> + + + + + + + + + + + + + + + + + +    + + + + + + + + + + + + + +
+ +
+ +
+ + +
+ + 		+ + + + + + + + + + + +
+ +
+ + +
+ + + +
+ +
diff --git a/GMW/GMW/WebUserControls/mod_UdcCella.ascx.cs b/GMW/GMW/WebUserControls/mod_UdcCella.ascx.cs index 1a65829d..ef67d1dc 100644 --- a/GMW/GMW/WebUserControls/mod_UdcCella.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_UdcCella.ascx.cs @@ -18,14 +18,7 @@ namespace GMW.WebUserControls protected string _tabCache; protected bool _showNewBtn = false; - /// - /// aggiorna controlli datagrid e numero righe in pagina - /// - protected override void aggiornaControlliDataGL() - { - base.aggiornaControlliDataGL(); - grView.PageSize = _righeDataGridShort; - } + /// /// traduce gli header delle colonne /// @@ -55,30 +48,7 @@ namespace GMW.WebUserControls lblNumRec.Text = ""; } } - /// - /// reset della selezione - /// - /// - /// - protected void btnReset_Click(object sender, EventArgs e) - { - resetSelezione(); - } - /// - /// gestione cambio selezione valore - /// - /// - /// - protected void grView_SelectedIndexChanged(object sender, EventArgs e) - { - // salvo in session il valore selezionato... - memLayer.ML.setSessionVal(string.Format("{0}_sel", _idxGridView), grView.SelectedValue, true); - // sollevo evento nuovo valore... - if (eh_selValore != null) - { - eh_selValore(this, new EventArgs()); - } - } + /// /// collega i controlli @@ -130,7 +100,14 @@ namespace GMW.WebUserControls #region area codice variabile - + /// + /// aggiorna controlli datagrid e numero righe in pagina + /// + protected override void aggiornaControlliDataGL() + { + base.aggiornaControlliDataGL(); + grView.PageSize = _righeDataGridShort; + } /// /// carico le tabelle /// @@ -154,34 +131,32 @@ namespace GMW.WebUserControls protected override void OnInit(EventArgs e) { base.OnInit(e); - _idxGridView = "UDC"; + if (!Page.IsPostBack) + { + traduzione(); + //pnlQta.Visible = false; + //pnlSposta.Visible = false; + } + _idxGridView = "UDC2edit"; + } + /// + /// traduzioni + /// + protected void traduzione() + { + // sistemo labels e buttons + lblQta.Text = traduci("lblQta"); + lblNewPos.Text = traduci("lblNewPos"); + btnQta.Text = traduci("btnQta"); + btnSposta.Text = traduci("btnSposta"); + cbeQta.ConfirmText = traduci("confermaRettificaQta"); + cbeSposta.ConfirmText = traduci("confermaSpostamentoUDC"); } /// /// verifica se attivo filtro company e imposta ods di conseguenza... /// private void checkFixOds() { - // controllo il tipo di ricerca e setto ods... - if (memLayer.ML.BoolSessionObj("SearchIsLikeBased")) - { - // svuoto select parameters - ods.SelectParameters.Clear(); - // imposto i parametri... - ods.SelectParameters.Add("searchVal", DbType.String, memLayer.ML.StringSessionObj("FullSearchValue")); - ods.SelectParameters.Add("CodCS", DbType.String, memLayer.ML.StringSessionObj("CodCS")); - // metto nuovo metodo select - ods.SelectMethod = "getByLikeSearch"; - } - else - { - // svuoto select parameters - ods.SelectParameters.Clear(); - // imposto i parametri... - ods.SelectParameters.Add("UDC", DbType.String, memLayer.ML.StringSessionObj("FullSearchValue")); - ods.SelectParameters.Add("CodCS", DbType.String, memLayer.ML.StringSessionObj("CodCS")); - // metto nuovo metodo select - ods.SelectMethod = "getByFullUdc"; - } } /// /// aggiorno ods al binding.. @@ -199,7 +174,119 @@ namespace GMW.WebUserControls // fix dell'ODS checkFixOds(); } + protected void grView_Sorted(object sender, EventArgs e) + { + // fix dell'ODS + checkFixOds(); + } + + protected void grView_RowUpdated(object sender, GridViewUpdatedEventArgs e) + { + // fix dell'ODS + checkFixOds(); + } + + /// + /// chiama procedura x spostamento tra celle di un UDC + /// + /// + /// + protected void btnSposta_Click1(object sender, EventArgs e) + { + // ricavo il valore dell'UDC cliccato... + string UDC = memLayer.ML.StringSessionObj(string.Format("{0}_sel", _idxGridView)); + int IdxCellaFrom = 0; + try + { + IdxCellaFrom = memLayer.ML.IntSessionObj("IdxCellaMag"); + } + catch + { } + int IdxCellaTo = 0; + try + { + IdxCellaTo = MagClass.magazzino.taCelle.getByCodCella(txtNewCella.Text)[0].IdxCella; + } + catch + { } + if (IdxCellaFrom > 0 && IdxCellaTo > 0) + { + MagClass.magazzino.spostaUDC(memLayer.ML.StringSessionObj("CodCS"), UDC, IdxCellaFrom, IdxCellaTo); + } + azzeraPostUpdate(); + if (eh_nuovoValore != null) + { + eh_nuovoValore(this, new EventArgs()); + } + } + /// + /// aggiorna la qta pezzi dell'UDC indicato + /// + /// + /// + protected void btnQta_Click(object sender, EventArgs e) + { + string UDC = memLayer.ML.StringSessionObj(string.Format("{0}_sel", _idxGridView)); + decimal qta = 0; + try + { + qta = Convert.ToDecimal(txtQta.Text); + } + catch + { } + if (qta > 0) + { + MagClass.magazzino.rettificaQtaUDC(UDC, qta); + } + azzeraPostUpdate(); + } + + /// + /// reset della selezione + /// + /// + /// + protected void btnReset_Click(object sender, EventArgs e) + { + azzeraPostUpdate(); + } + + private void azzeraPostUpdate() + { + grView.DataBind(); + resetSelezione(); + txtNewCella.Text = ""; + txtQta.Text = ""; + doShowPanels(false); + } + /// + /// gestione cambio selezione valore + /// + /// + /// + protected void grView_SelectedIndexChanged(object sender, EventArgs e) + { + // salvo in session il valore selezionato... + memLayer.ML.setSessionVal(string.Format("{0}_sel", _idxGridView), grView.SelectedValue, true); + // fix panels + doShowPanels(true); + // sollevo evento nuovo valore... + if (eh_selValore != null) + { + eh_selValore(this, new EventArgs()); + } + } + /// + /// determina visibilità panels correzione valori + /// + /// + private void doShowPanels(bool p) + { + pnlQta.Visible = p; + pnlSposta.Visible = p; + } #endregion + } } \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_UdcCella.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_UdcCella.ascx.designer.cs index 12e61d3e..91f07462 100644 --- a/GMW/GMW/WebUserControls/mod_UdcCella.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_UdcCella.ascx.designer.cs @@ -48,5 +48,104 @@ namespace GMW.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblWarning; + + /// + /// pnlQta control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlQta; + + /// + /// lblQta control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblQta; + + /// + /// txtQta control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtQta; + + /// + /// btnQta control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnQta; + + /// + /// cbeQta control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::AjaxControlToolkit.ConfirmButtonExtender cbeQta; + + /// + /// pnlSposta control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlSposta; + + /// + /// lblNewPos control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblNewPos; + + /// + /// txtNewCella control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtNewCella; + + /// + /// aceParticolare control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::AjaxControlToolkit.AutoCompleteExtender aceParticolare; + + /// + /// btnSposta control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnSposta; + + /// + /// cbeSposta control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::AjaxControlToolkit.ConfirmButtonExtender cbeSposta; } } diff --git a/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx b/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx index d13bd6cb..c5045212 100644 --- a/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx +++ b/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx @@ -52,12 +52,14 @@ - - - - -
- + +
+ +
+
+ + +
diff --git a/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs b/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs index 42996364..f7f09d85 100644 --- a/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs @@ -43,6 +43,7 @@ namespace GMW.WebUserControls mod_paretoPartByFullSpec1.eh_resetSelezione += new EventHandler(mod_paretoPartByFullSpec1_eh_resetSelezione); mod_dettCelleBlocco1.eh_selValore += new EventHandler(mod_dettCelleBlocco1_eh_selValore); mod_operazioniUdc1.eh_updated += new EventHandler(mod_operazioniUdc1_eh_updated); + mod_operazioniUdc1.eh_hidden += new EventHandler(mod_operazioniUdc1_eh_hidden); if (!Page.IsPostBack) { lnkReturn.Text = traduci("TornaStatoMag"); @@ -61,12 +62,23 @@ namespace GMW.WebUserControls { memLayer.ML.setSessionVal("CodMag_sel", mod_filtroMag.valore, false); } - mod_paretoPartByFullSpec1.Visible = false; + pnlDetail.Visible = false; mod_operazioniUdc1.Visible = false; updateControlli(); } } /// + /// nascondo dettagli UDC + /// + /// + /// + void mod_operazioniUdc1_eh_hidden(object sender, EventArgs e) + { + mod_operazioniUdc1.Visible = false; + mod_dettCelleBlocco1.doUpdate(); + updateControlli(); + } + /// /// eseguito all'evento update modulo operazioni UDC /// /// @@ -107,7 +119,7 @@ namespace GMW.WebUserControls mod_dettCelleBlocco1.reset(); mod_dettCelleBlocco1.doUpdate(); mod_paretoPartByFullSpec1.resetSelezione(); - mod_paretoPartByFullSpec1.Visible = false; + pnlDetail.Visible = false; mod_operazioniUdc1.Visible = false; } /// @@ -120,7 +132,7 @@ namespace GMW.WebUserControls // aggiorno la visualizzazione del magazzino! mod_dettCelleBlocco1.doUpdate(); mod_paretoPartByFullSpec1.resetSelezione(); - mod_paretoPartByFullSpec1.Visible = true; + pnlDetail.Visible = true; } void mod_filtroBlock_eh_selValore(object sender, EventArgs e) { @@ -134,6 +146,7 @@ namespace GMW.WebUserControls memLayer.ML.emptySessionVal("IdxBlocco_sel"); } // chiamo procedura che aggiorna ods principale + mod_dettCelleBlocco1.doUpdate(); updateControlli(); } diff --git a/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.designer.cs index 3f24a826..a0378e24 100644 --- a/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.designer.cs @@ -85,6 +85,15 @@ namespace GMW.WebUserControls { /// protected global::GMW.WebUserControls.mod_paretoUdcBlocco mod_paretoUdcBlocco1; + /// + /// pnlDetail control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlDetail; + /// /// mod_paretoPartByFullSpec1 control. /// diff --git a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs index fcfe6dad..bc711373 100644 --- a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs @@ -573,7 +573,6 @@ namespace GMW.WebUserControls SteamWare.memLayer.ML.emptySessionVal("nextObjCommand"); } string CodSoggetto = "O0000000000000069"; // operatore a caso, POI sarà da cercare da operatore correntemente loggato... !!!FARE!!! - // verifico il tipo di richiesta (up/down level, clona o update normale switch (_comando) { case "attivaListaPrelievo": diff --git a/GMW/GMW/WebUserControls/mod_operazioniUdc.ascx b/GMW/GMW/WebUserControls/mod_operazioniUdc.ascx index 8045476d..a67ffa25 100644 --- a/GMW/GMW/WebUserControls/mod_operazioniUdc.ascx +++ b/GMW/GMW/WebUserControls/mod_operazioniUdc.ascx @@ -26,6 +26,11 @@ + + + + + diff --git a/GMW/GMW/WebUserControls/mod_operazioniUdc.ascx.cs b/GMW/GMW/WebUserControls/mod_operazioniUdc.ascx.cs index 5eda8931..411c226f 100644 --- a/GMW/GMW/WebUserControls/mod_operazioniUdc.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_operazioniUdc.ascx.cs @@ -26,15 +26,28 @@ namespace GMW.WebUserControls { traduciObj(); } + mod_UdcCella1.eh_nuovoValore += new EventHandler(mod_UdcCella1_eh_nuovoValore); disegnaControlli(); } + void mod_UdcCella1_eh_nuovoValore(object sender, EventArgs e) + { + if (eh_updated != null) + { + eh_updated(this, new EventArgs()); + } + } + #region eventi esposti /// /// Evento al cambio di quantità UDC /// public event EventHandler eh_updated; + /// + /// crea evento x nascondere il controllo + /// + public event EventHandler eh_hidden; #endregion @@ -46,7 +59,7 @@ namespace GMW.WebUserControls lodaSessionData(); lblCella.Text = string.Format("{0}: {1}", traduci("CodCella"), CodCella); setupButtons(idxCella, CodCella); - resetUdcDetail(); + //resetUdcDetail(); // !!! FARE controllo se serva davvero.. } /// /// ridisegna dettagli UDC x cella selezionata @@ -74,6 +87,7 @@ namespace GMW.WebUserControls btnSblocca.Text = traduci("btnSbloccaCella"); btnCompleta.Text = traduci("btnCompletaCella"); btnDisponibile.Text = traduci("btnDisponibileCella"); + btnClose.Text = traduci("btnClose"); } /// /// determina abilitazioni bottoni x cella @@ -120,82 +134,6 @@ namespace GMW.WebUserControls return user_std.UtSn.Traduci(lemma.ToString()); } - protected void btnSposta_Click(object sender, EventArgs e) - { - -#if false - /* - * fare così: - * - salvare in sessione questo valore come FROM come "UdcReqMagFrom" - * - cambiare pulsante da sposta a conferma - * - attendere nuovo click, e cercare se c'è un FROM - * - al nuovo click sullo stesso chiedere conferma dello spostamento tra le 2 posizioni (clickButtonextender ajax come delete) - * - fare spostamento con codice di esempio commentato in #if - * - svuotare sessione from - * - * */ - - // ricavo il valore dell'UDC cliccato... - string UDC = memLayer.ML.StringSessionObj("UdcReqMag"); - // .. e lo setto come valore FROM oltre che valore cliccato - memLayer.ML.setSessionVal("UdcReqMagFrom", UDC); - - int IdxCellaFrom = 0; - try - { - IdxCellaFrom = MagClass.magazzino.taCelle.getByCodCella(memLayer.ML.StringSessionObj("UdcReqMagFrom"))[0].IdxCella; - } - catch - { } - int IdxCellaTo = 0; - try - { - IdxCellaTo = MagClass.magazzino.taCelle.getByCodCella(memLayer.ML.StringSessionObj("UdcReqMag"))[0].IdxCella; - } - catch - { } -#endif -#if false - if (IdxCellaFrom > 0 && IdxCellaTo > 0) - { - MagClass.magazzino.spostaUDC(memLayer.ML.StringSessionObj("CodCS"), UDC, IdxCellaFrom, IdxCellaTo); - } -#endif - } - - protected void btnQty_Click(object sender, EventArgs e) - { -#if false - /* - * fare così: - * - controlalre se qty > 0 - * - chiedere conferma (clickButtonextender ajax come delete) - * - chiamare metodo in MagClass x cambio qty, secondo esempio seguente - * - chiamare evento x update visualizzaizone (il metodo va...) - */ - - string CodSoggetto = "O0000000000000069"; // operatore a caso, POI sarà da cercare da operatore correntemente loggato... - string UDC = memLayer.ML.StringSessionObj("UdcReqMag"); - decimal qta = 0; - try - { - qta = Convert.ToDecimal(txtNewQty.Text); - } - catch - { } - if (qta > 0) - { - MagClass.magazzino.rettificaQtaUDC(CodSoggetto, UDC, qta); - } - - // mettere evento da "beccare fuori" x fare ridisegno!!!! - - if (eh_cambioQty != null) - { - eh_cambioQty(this, new EventArgs()); - } -#endif - } #region metodi update cella @@ -251,8 +189,24 @@ namespace GMW.WebUserControls eh_updated(this, new EventArgs()); } } + /// + /// resetta e chiude... + /// + /// + /// + protected void btnClose_Click(object sender, EventArgs e) + { + // elimina da session... + memLayer.ML.emptySessionVal("IdxCellaMag"); + resetUdcDetail(); + if (eh_hidden != null) + { + eh_hidden(this, new EventArgs()); + } + } #endregion + } } \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_operazioniUdc.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_operazioniUdc.ascx.designer.cs index eced95cb..cac9d3b2 100644 --- a/GMW/GMW/WebUserControls/mod_operazioniUdc.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_operazioniUdc.ascx.designer.cs @@ -58,6 +58,15 @@ namespace GMW.WebUserControls { /// protected global::System.Web.UI.WebControls.Button btnDisponibile; + /// + /// btnClose control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnClose; + /// /// mod_UdcCella1 control. /// diff --git a/GMW/GMW/WebUserControls/mod_statoMag.ascx b/GMW/GMW/WebUserControls/mod_statoMag.ascx index a6caf5de..ac710125 100644 --- a/GMW/GMW/WebUserControls/mod_statoMag.ascx +++ b/GMW/GMW/WebUserControls/mod_statoMag.ascx @@ -35,6 +35,11 @@ ToolTip='<%# traduci("Select") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.seleziona, SteamWare.dimImg.small) %>' /> + + + + + @@ -47,7 +52,7 @@ - +
/ @@ -57,7 +62,7 @@ - +
diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 77e2e3d4..3863cd17 100644 Binary files a/GMW/GMW/bin/GMW.dll and b/GMW/GMW/bin/GMW.dll differ diff --git a/GMW/GMW/bin/GMW_data.dll b/GMW/GMW/bin/GMW_data.dll index 56910c51..9cb68d36 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 77e2e3d4..3863cd17 100644 Binary files a/GMW/GMW/obj/Debug/GMW.dll and b/GMW/GMW/obj/Debug/GMW.dll differ diff --git a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache index 5ae770d6..06ed9167 100644 Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Term/GMW_Term.csproj b/GMW/GMW_Term/GMW_Term.csproj index 4464e2ba..585c6384 100644 --- a/GMW/GMW_Term/GMW_Term.csproj +++ b/GMW/GMW_Term/GMW_Term.csproj @@ -30,10 +30,6 @@ 4 - - False - ..\..\..\..\..\..\..\Library\AjaxControlToolkit1016\SampleWebSite\Bin\AjaxControlToolkit.dll - @@ -57,142 +53,19 @@ + - - mod_barcode.ascx + ASPXCodeBehind + Default.aspx - - mod_barcode.ascx - - - mod_changeUser.ascx - ASPXCodeBehind - - - mod_changeUser.ascx - - - mod_home.ascx - ASPXCodeBehind - - - mod_home.ascx - - - mod_listePrelievo.ascx - ASPXCodeBehind - - - mod_listePrelievo.ascx - - - mod_login.ascx - ASPXCodeBehind - - - mod_login.ascx - - - mod_search.ascx - ASPXCodeBehind - - - mod_search.ascx - - - mod_userBar.ascx - ASPXCodeBehind - - - mod_userBar.ascx - - - AutoCompletamento.asmx - Component - - - Barcode.aspx - ASPXCodeBehind - - - Barcode.aspx - - - ChangeUser.aspx - ASPXCodeBehind - - - ChangeUser.aspx - - - Home.aspx - ASPXCodeBehind - - - Home.aspx - - - ListePrelievo.aspx - ASPXCodeBehind - - - ListePrelievo.aspx - - - Login.aspx - ASPXCodeBehind - - - Login.aspx - - - Search.aspx - ASPXCodeBehind - - - Search.aspx - - - Compact.Master - ASPXCodeBehind - - - Compact.Master + + Default.aspx - - - - - - - - - - - - - - - - - - - - - - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5} - SteamWare - - - {47143721-A018-4BDA-B544-EC3E10BC87A2} - GMW_data - - @@ -211,7 +84,7 @@ False True - 50077 + 63528 / diff --git a/GMW/GMW_Term/GMW_Term.csproj.user b/GMW/GMW_Term/GMW_Term.csproj.user index 92c01509..ded0e139 100644 --- a/GMW/GMW_Term/GMW_Term.csproj.user +++ b/GMW/GMW_Term/GMW_Term.csproj.user @@ -1,10 +1,11 @@  - + - Login.aspx - SpecificPage + + + CurrentPage True False False diff --git a/GMW/GMW_Term/Web.config b/GMW/GMW_Term/Web.config index 97b2cab7..39029802 100644 --- a/GMW/GMW_Term/Web.config +++ b/GMW/GMW_Term/Web.config @@ -1,176 +1,125 @@ - + + - - - -
- -
-
-
-
+ + + + + +
+ +
+
+
+
+ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index 0814b2be..1c36070a 100644 Binary files a/GMW/GMW_Term/bin/GMW_Term.dll and b/GMW/GMW_Term/bin/GMW_Term.dll differ diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.csproj.FileListAbsolute.txt b/GMW/GMW_Term/obj/Debug/GMW_Term.csproj.FileListAbsolute.txt index 01bf7c96..b409fbd3 100644 --- a/GMW/GMW_Term/obj/Debug/GMW_Term.csproj.FileListAbsolute.txt +++ b/GMW/GMW_Term/obj/Debug/GMW_Term.csproj.FileListAbsolute.txt @@ -3,32 +3,3 @@ C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\ResolveAssemblyReference.cache C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\GMW_Term.dll C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\GMW_Term.pdb -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_Term.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_Term.pdb -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\AjaxControlToolkit.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_data.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\SteamWare.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ICSharpCode.SharpZipLib.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\AjaxControlToolkit.pdb -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_data.pdb -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\SteamWare.pdb -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\SteamWare.xml -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ar\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\cs\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\de\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\es\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\fr\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\he\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\hi\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\it\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ja\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ko\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\nl\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\pt\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ru\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\tr-TR\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\zh-CHS\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\zh-CHT\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\ResolveAssemblyReference.cache -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\GMW_Term.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\GMW_Term.pdb diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index 0814b2be..1c36070a 100644 Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ diff --git a/GMW/GMW_data/DS_magazzino.Designer.cs b/GMW/GMW_data/DS_magazzino.Designer.cs index 5113184b..4e50d123 100644 --- a/GMW/GMW_data/DS_magazzino.Designer.cs +++ b/GMW/GMW_data/DS_magazzino.Designer.cs @@ -14775,7 +14775,7 @@ SELECT IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxB [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[11]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[12]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT * FROM dbo.Celle"; @@ -14794,65 +14794,72 @@ SELECT IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxB this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCella", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 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_cellaGetByCodMag"; + this._commandCollection[3].CommandText = "dbo.stp_cellaGetByCodCellaLike"; 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("@CodCella", 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("@CodCS", global::System.Data.SqlDbType.VarChar, 2, 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("@CodMag", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; - this._commandCollection[4].CommandText = "dbo.stp_cellaGetByIdxBlocco"; + this._commandCollection[4].CommandText = "dbo.stp_cellaGetByCodMag"; this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[4].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[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxBlocco", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].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, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodMag", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[5].Connection = this.Connection; - this._commandCollection[5].CommandText = "dbo.stp_cellaGetByTipoCella"; + this._commandCollection[5].CommandText = "dbo.stp_cellaGetByIdxBlocco"; 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("@IdxTipoCella", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxBlocco", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[6].Connection = this.Connection; - this._commandCollection[6].CommandText = "dbo.stp_celleLibereGetByIdxBlocco"; + this._commandCollection[6].CommandText = "dbo.stp_cellaGetByTipoCella"; this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[6].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[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxBlocco", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxTipoCella", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[7].Connection = this.Connection; - this._commandCollection[7].CommandText = "dbo.stp_celleNonAttiveByIdxBlocco"; + this._commandCollection[7].CommandText = "dbo.stp_celleLibereGetByIdxBlocco"; this._commandCollection[7].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[7].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[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxBlocco", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[8] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[8].Connection = this.Connection; - this._commandCollection[8].CommandText = "dbo.stp_celle_updAttiva"; + this._commandCollection[8].CommandText = "dbo.stp_celleNonAttiveByIdxBlocco"; this._commandCollection[8].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[8].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[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxCella", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Attiva", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxBlocco", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[9] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[9].Connection = this.Connection; - this._commandCollection[9].CommandText = "dbo.stp_celle_updPiena"; + this._commandCollection[9].CommandText = "dbo.stp_celle_updAttiva"; this._commandCollection[9].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[9].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[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxCella", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Piena", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Attiva", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[10] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[10].Connection = this.Connection; - this._commandCollection[10].CommandText = "dbo.stp_celle_updateQuery"; + this._commandCollection[10].CommandText = "dbo.stp_celle_updPiena"; this._commandCollection[10].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[10].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[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxCella", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[10].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, "", "", "")); - this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCella", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxTipoCella", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Descrizione", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Attiva", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxCella", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Piena", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxBlocco", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@X", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Y", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Z", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[11] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[11].Connection = this.Connection; + this._commandCollection[11].CommandText = "dbo.stp_celle_updateQuery"; + this._commandCollection[11].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[11].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[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxCella", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[11].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, "", "", "")); + this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCella", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxTipoCella", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Descrizione", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Attiva", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Piena", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxBlocco", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@X", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Y", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Z", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -14896,8 +14903,30 @@ SELECT IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxB [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_magazzino.CelleDataTable getByCodMag(string CodCS, string CodMag) { + public virtual DS_magazzino.CelleDataTable getByCodCellaLike(string CodCella, string CodCS) { this.Adapter.SelectCommand = this.CommandCollection[3]; + if ((CodCella == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(CodCella)); + } + if ((CodCS == null)) { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(CodCS)); + } + DS_magazzino.CelleDataTable dataTable = new DS_magazzino.CelleDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_magazzino.CelleDataTable getByCodMag(string CodCS, string CodMag) { + this.Adapter.SelectCommand = this.CommandCollection[4]; if ((CodCS == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -14919,7 +14948,7 @@ SELECT IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxB [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_magazzino.CelleDataTable getByIdxBlocco(global::System.Nullable IdxBlocco) { - this.Adapter.SelectCommand = this.CommandCollection[4]; + this.Adapter.SelectCommand = this.CommandCollection[5]; if ((IdxBlocco.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(IdxBlocco.Value)); } @@ -14935,7 +14964,7 @@ SELECT IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxB [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_magazzino.CelleDataTable getByTipoCella(global::System.Nullable IdxTipoCella) { - this.Adapter.SelectCommand = this.CommandCollection[5]; + this.Adapter.SelectCommand = this.CommandCollection[6]; if ((IdxTipoCella.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(IdxTipoCella.Value)); } @@ -14951,7 +14980,7 @@ SELECT IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxB [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_magazzino.CelleDataTable getLibereByIdxBlocco(global::System.Nullable IdxBlocco) { - this.Adapter.SelectCommand = this.CommandCollection[6]; + this.Adapter.SelectCommand = this.CommandCollection[7]; if ((IdxBlocco.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(IdxBlocco.Value)); } @@ -14967,7 +14996,7 @@ SELECT IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxB [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_magazzino.CelleDataTable getNonAttiveByIdxBlocco(global::System.Nullable IdxBlocco) { - this.Adapter.SelectCommand = this.CommandCollection[7]; + this.Adapter.SelectCommand = this.CommandCollection[8]; if ((IdxBlocco.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(IdxBlocco.Value)); } @@ -15324,7 +15353,7 @@ SELECT IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxB [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int stp_celle_updAttiva(global::System.Nullable IdxCella, global::System.Nullable Attiva) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[8]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[9]; if ((IdxCella.HasValue == true)) { command.Parameters[1].Value = ((int)(IdxCella.Value)); } @@ -15357,7 +15386,7 @@ SELECT IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxB [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int stp_celle_updPiena(global::System.Nullable IdxCella, global::System.Nullable Piena) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[9]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[10]; if ((IdxCella.HasValue == true)) { command.Parameters[1].Value = ((int)(IdxCella.Value)); } @@ -15391,7 +15420,7 @@ SELECT IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxB [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, false)] public virtual int UpdateQuery(global::System.Nullable Original_IdxCella, string CodCS, string CodCella, global::System.Nullable IdxTipoCella, string Descrizione, global::System.Nullable Attiva, global::System.Nullable Piena, global::System.Nullable IdxBlocco, global::System.Nullable X, global::System.Nullable Y, global::System.Nullable Z) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[10]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[11]; if ((Original_IdxCella.HasValue == true)) { command.Parameters[1].Value = ((int)(Original_IdxCella.Value)); } diff --git a/GMW/GMW_data/DS_magazzino.xsd b/GMW/GMW_data/DS_magazzino.xsd index dddb1eae..b7b774dd 100644 --- a/GMW/GMW_data/DS_magazzino.xsd +++ b/GMW/GMW_data/DS_magazzino.xsd @@ -840,6 +840,18 @@ SELECT IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxB + + + + dbo.stp_cellaGetByCodCellaLike + + + + + + + + diff --git a/GMW/GMW_data/DS_magazzino.xss b/GMW/GMW_data/DS_magazzino.xss index f41ee07f..963dd0cb 100644 --- a/GMW/GMW_data/DS_magazzino.xss +++ b/GMW/GMW_data/DS_magazzino.xss @@ -4,23 +4,23 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - - - + + + - + - + @@ -61,7 +61,7 @@ - + 712 @@ -77,11 +77,11 @@ 1014 - 757 + 755 - 946 - 757 + 941 + 755 diff --git a/GMW/GMW_data/MagClass.cs b/GMW/GMW_data/MagClass.cs index d286dd5a..20c3f491 100644 --- a/GMW/GMW_data/MagClass.cs +++ b/GMW/GMW_data/MagClass.cs @@ -211,8 +211,9 @@ namespace GMW_data /// Codice UDC /// Nuova quantita associata /// esito comando - public bool rettificaQtaUDC(string CodSoggetto, string UDC, decimal qta) + public bool rettificaQtaUDC(string UDC, decimal qta) { + string CodSoggetto = CodSoggCurrUser(); bool answ = false; try { @@ -274,15 +275,7 @@ namespace GMW_data string RagioneSociale = ""; // ricavo da session... - string codSoggetto = ""; - try - { - codSoggetto = DataProxy.obj.taSogg2Oper.getBuUserDominio(user_std.UtSn.utente, user_std.UtSn.dominio)[0].CodSoggetto; - } - catch (Exception e) - { - logger.lg.scriviLog(string.Format("Non sono riuscito a recuperare il codice soggetto per l'utente loggato: {0}", user_std.UtSn.userNameAD), tipoLog.ERROR); - } + string codSoggetto = CodSoggCurrUser(); // proseguo SOLO se ho trovato cod soggetto... if (codSoggetto != "") { @@ -761,6 +754,24 @@ namespace GMW_data { } return answ; } + /// + /// restituisce codice soggetto dell'user corrente + /// + /// + public string CodSoggCurrUser() + { + // ricavo da session... + string codSoggetto = ""; + try + { + codSoggetto = DataProxy.obj.taSogg2Oper.getBuUserDominio(user_std.UtSn.utente, user_std.UtSn.dominio)[0].CodSoggetto; + } + catch (Exception e) + { + logger.lg.scriviLog(string.Format("Non sono riuscito a recuperare il codice soggetto per l'utente loggato: {0}", user_std.UtSn.userNameAD), tipoLog.ERROR); + } + return codSoggetto; + } #endregion } diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 56910c51..9cb68d36 100644 Binary files a/GMW/GMW_data/bin/Debug/GMW_data.dll and b/GMW/GMW_data/bin/Debug/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll index 56910c51..9cb68d36 100644 Binary files a/GMW/GMW_data/obj/Debug/GMW_data.dll and b/GMW/GMW_data/obj/Debug/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll b/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll index dcbf49f8..05a91394 100644 Binary files a/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll and b/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll index e3e57fbb..8f85adf7 100644 Binary files a/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll and b/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll differ