diff --git a/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx b/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx index 7e74b524..dcac219e 100644 --- a/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx @@ -259,7 +259,8 @@ - + diff --git a/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx.cs index 79f64267..8874cc6b 100644 --- a/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx.cs @@ -39,6 +39,57 @@ namespace GMW_Term.WebUserControls } } /// + /// CodLista della lsita di prelievo correntemente attiva + /// + protected string _CodLista + { + get + { + return memLayer.ML.StringSessionObj("CodLista_sel"); + } + set + { + memLayer.ML.setSessionVal("CodLista_sel", value); + } + } + /// + /// Particolare dell'UDC correntemente selezionato + /// + protected string _PartUdc + { + get + { + string answ = ""; + try + { + answ = MagClass.magazzino.taDettUDC.getByFullUdc(_UDC, _CodCS)[0].Particolare; + } + catch + { } + return answ; + } + } + /// + /// Particolare della Lista di Prelievo correntemente attiva + /// + protected string _PartLdP + { + get + { + string answ = ""; + if (_CodLista != "") + { + try + { + answ = MagClass.magazzino.taElencoListePrelievo.getByCodLista(_CodLista)[0].Particolare; + } + catch + { } + } + return answ; + } + } + /// /// testo contenuto nella textbox /// public string txtScansione @@ -137,7 +188,7 @@ namespace GMW_Term.WebUserControls btnRettifica.Enabled = true; btnChiudi.Enabled = true; // button preleva abilitato SOLO SE c'รจ una lista di prelievo attiva per l'utente e per il particolare corrente... - if (memLayer.ML.BoolSessionObj("ListaPrelievoAttiva")) + if (_CodLista != "" && (_PartLdP == _PartUdc)) { btnPreleva.Enabled = true; } @@ -455,14 +506,14 @@ namespace GMW_Term.WebUserControls protected void btnDeposita_Click(object sender, EventArgs e) { // nasconde/mostra panels - resetinputPanel(); + resetInputPanel(); editAttivo = tipoEditUdc.deposito; setupBtnChiudi(); } /// /// resetta panel input /// - private void resetinputPanel() + private void resetInputPanel() { pnlButtons.Visible = false; pnlInput.Visible = true; @@ -478,7 +529,7 @@ namespace GMW_Term.WebUserControls protected void btnSposta_Click(object sender, EventArgs e) { // nasconde/mostra panels - resetinputPanel(); + resetInputPanel(); editAttivo = tipoEditUdc.spostamento; setupBtnChiudi(); } @@ -535,10 +586,23 @@ namespace GMW_Term.WebUserControls break; } } - + /// + /// associa l'UDC corrente alla lsita di prelievo attualmente in essere... + /// + /// + /// + protected void btnPreleva_Click(object sender, EventArgs e) + { + MagClass.magazzino.confermaUdcPrelevatoPerLista(_CodLista, _UDC); + // nasconde/mostra panels + resetInputPanel(); + editAttivo = tipoEditUdc.nd; + setupBtnChiudi(); + } #endregion + #endregion } diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index d301b32f..38f19bfb 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.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index d301b32f..38f19bfb 100644 Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ