From 9e10b66d7afdc8e1902a3c9344a14e4e157ab2cf Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 18 Mar 2020 16:15:38 +0100 Subject: [PATCH] rinominato componente x semilavorati --- MP-MAG/WebUserControls/cmp_prtSemilav.ascx | 8 +- MP-MAG/WebUserControls/cmp_prtSemilav.ascx.cs | 24 ++++- .../cmp_prtSemilav.ascx.designer.cs | 13 ++- .../WebUserControls/cmp_semiLavLottiIn.ascx | 95 ------------------- .../cmp_semiLavLottiIn.ascx.cs | 70 -------------- .../cmp_semiLavLottiIn.ascx.designer.cs | 62 ------------ 6 files changed, 36 insertions(+), 236 deletions(-) delete mode 100644 MP-MAG/WebUserControls/cmp_semiLavLottiIn.ascx delete mode 100644 MP-MAG/WebUserControls/cmp_semiLavLottiIn.ascx.cs delete mode 100644 MP-MAG/WebUserControls/cmp_semiLavLottiIn.ascx.designer.cs diff --git a/MP-MAG/WebUserControls/cmp_prtSemilav.ascx b/MP-MAG/WebUserControls/cmp_prtSemilav.ascx index 937dd83..6769bd5 100644 --- a/MP-MAG/WebUserControls/cmp_prtSemilav.ascx +++ b/MP-MAG/WebUserControls/cmp_prtSemilav.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_prtSemilav.ascx.cs" Inherits="MP_MAG.WebUserControls.cmp_prtSemilav" %> <%@ Register Src="~/WebUserControls/cmp_barcode.ascx" TagPrefix="uc1" TagName="cmp_barcode" %> <%@ Register Src="~/WebUserControls/cmp_semiLavLottiOut.ascx" TagPrefix="uc1" TagName="cmp_semiLavLottiOut" %> -<%@ Register Src="~/WebUserControls/cmp_semiLavLottiIn.ascx" TagPrefix="uc1" TagName="cmp_semiLavLottiIn" %> +<%@ Register Src="~/WebUserControls/cmp_LottiIn.ascx" TagPrefix="uc1" TagName="cmp_LottiIn" %> <%@ Register Src="~/WebUserControls/cmp_semiLavArtOut.ascx" TagPrefix="uc1" TagName="cmp_semiLavArtOut" %> <%@ Register Src="~/WebUserControls/cmp_printLottoOUT.ascx" TagPrefix="uc1" TagName="cmp_printLottoOUT" %> <%@ Register Src="~/WebUserControls/cmp_creaLottoOUT.ascx" TagPrefix="uc1" TagName="cmp_creaLottoOUT" %> @@ -15,8 +15,12 @@
+
+

+

+
- +
diff --git a/MP-MAG/WebUserControls/cmp_prtSemilav.ascx.cs b/MP-MAG/WebUserControls/cmp_prtSemilav.ascx.cs index 104f6fc..0ee7f33 100644 --- a/MP-MAG/WebUserControls/cmp_prtSemilav.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_prtSemilav.ascx.cs @@ -12,6 +12,20 @@ namespace MP_MAG.WebUserControls { public partial class cmp_prtSemilav : BaseUserControl { + /// + /// Tipo Stampa + /// + public string tipoStampa + { + get + { + return lblTipoStampa.Text; + } + set + { + lblTipoStampa.Text = value; + } + } /// /// Comando ULTIMO barcode letto /// @@ -115,11 +129,11 @@ namespace MP_MAG.WebUserControls { get { - return cmp_semiLavLottiIn.lottiSel; + return cmp_LottiIn.lottiSel; } set { - cmp_semiLavLottiIn.lottiSel = value; + cmp_LottiIn.lottiSel = value; cmp_semiLavLottiOut.lottiSel = value; cmp_semiLavArtOut.lottiSel = value; } @@ -141,7 +155,7 @@ namespace MP_MAG.WebUserControls cmp_barcode.eh_doRefresh += Cmp_barcode_eh_doRefresh; // eventi reset lotti IN cmp_barcode.eh_doReset += Cmp_barcode_eh_doReset; - cmp_semiLavLottiIn.eh_doReset += Cmp_semiLavLottiIn_eh_doReset; + cmp_LottiIn.eh_doReset += cmp_LottiIn_eh_doReset; // selezione articoli cmp_semiLavArtOut.eh_doRefresh += Cmp_semiLavArtOut_eh_doRefresh; cmp_semiLavArtOut.eh_doReset += Cmp_semiLavArtOut_eh_doReset; @@ -166,7 +180,7 @@ namespace MP_MAG.WebUserControls private void Cmp_creaLottoOUT_eh_doRefresh(object sender, EventArgs e) { - MagDataLayer.man.taEL.insertQuery(tipoLotto, cmp_semiLavArtOut.CodArtSel, codStato, origine, "", cmp_creaLottoOUT.qtaOrig, cmp_creaLottoOUT.numUdc, RifExt, cmp_semiLavLottiIn.elLotti); + MagDataLayer.man.taEL.insertQuery(tipoLotto, cmp_semiLavArtOut.CodArtSel, codStato, origine, "", cmp_creaLottoOUT.qtaOrig, cmp_creaLottoOUT.numUdc, RifExt, cmp_LottiIn.elLotti); cmp_semiLavLottiOut.doUpdate(); } @@ -221,7 +235,7 @@ namespace MP_MAG.WebUserControls //if (!showPrint) cmp_semiLavArtOut.deSelect(); } - private void Cmp_semiLavLottiIn_eh_doReset(object sender, EventArgs e) + private void cmp_LottiIn_eh_doReset(object sender, EventArgs e) { Response.Redirect(user_std.pagCorrente); } diff --git a/MP-MAG/WebUserControls/cmp_prtSemilav.ascx.designer.cs b/MP-MAG/WebUserControls/cmp_prtSemilav.ascx.designer.cs index 0c27a5e..13baf5e 100644 --- a/MP-MAG/WebUserControls/cmp_prtSemilav.ascx.designer.cs +++ b/MP-MAG/WebUserControls/cmp_prtSemilav.ascx.designer.cs @@ -69,13 +69,22 @@ namespace MP_MAG.WebUserControls protected global::System.Web.UI.WebControls.HiddenField hfLastValidBCode; /// - /// Controllo cmp_semiLavLottiIn. + /// Controllo lblTipoStampa. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::MP_MAG.WebUserControls.cmp_semiLavLottiIn cmp_semiLavLottiIn; + protected global::System.Web.UI.WebControls.Label lblTipoStampa; + + /// + /// Controllo cmp_LottiIn. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MP_MAG.WebUserControls.cmp_LottiIn cmp_LottiIn; /// /// Controllo cmp_ArtRich. diff --git a/MP-MAG/WebUserControls/cmp_semiLavLottiIn.ascx b/MP-MAG/WebUserControls/cmp_semiLavLottiIn.ascx deleted file mode 100644 index b69a477..0000000 --- a/MP-MAG/WebUserControls/cmp_semiLavLottiIn.ascx +++ /dev/null @@ -1,95 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_semiLavLottiIn.ascx.cs" Inherits="MP_MAG.WebUserControls.cmp_semiLavLottiIn" %> - -
-
-
-
-
Elenco Lotti IN
-
-
- -
-
-
-
- - - - - - - Nessun Risultato - - - <%-- - - - - - - - --%> - - -
-
- - -
-
- -
-
- -
-
-
-
- - - -
-
- -
-
- - -
-
-
-
- - - - / - - - - - -
- -
-
- - -
-
-
- - - - - -
-
- - - - - - -
-
- diff --git a/MP-MAG/WebUserControls/cmp_semiLavLottiIn.ascx.cs b/MP-MAG/WebUserControls/cmp_semiLavLottiIn.ascx.cs deleted file mode 100644 index 7a7675e..0000000 --- a/MP-MAG/WebUserControls/cmp_semiLavLottiIn.ascx.cs +++ /dev/null @@ -1,70 +0,0 @@ -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace MP_MAG.WebUserControls -{ - public partial class cmp_semiLavLottiIn : BaseUserControl - { - - /// - /// Elenco dei lotti selezionati - /// - public List lottiSel - { - get - { - List answ = null; - string rawVal = hfJsonLotti.Value; - try - { - answ = JsonConvert.DeserializeObject>(rawVal); - } - catch - { } - if (answ == null) - { - answ = new List(); - } - return answ; - } - set - { - string rawVal = JsonConvert.SerializeObject(value); - hfJsonLotti.Value = rawVal; - // salvo ANCHE elenco in formato #lotto#lotto# - string eliString = $"#{string.Join("#", value)}#"; - hfHashList.Value = eliString; - // update grView... - grViewLottoIn.DataBind(); - } - } - /// - /// Elenco lotti in formato HashList - /// - public string elLotti - { - get - { - return hfHashList.Value; - } - } - protected void Page_Load(object sender, EventArgs e) - { - - } - /// - /// reset sel lottoIn - /// - /// - /// - protected void lbtResetLottoIn_Click(object sender, EventArgs e) - { - raiseReset(); - } - } -} \ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_semiLavLottiIn.ascx.designer.cs b/MP-MAG/WebUserControls/cmp_semiLavLottiIn.ascx.designer.cs deleted file mode 100644 index e960512..0000000 --- a/MP-MAG/WebUserControls/cmp_semiLavLottiIn.ascx.designer.cs +++ /dev/null @@ -1,62 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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 MP_MAG.WebUserControls -{ - - - public partial class cmp_semiLavLottiIn - { - - /// - /// Controllo lbtResetLottoIn. - /// - /// - /// 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.LinkButton lbtResetLottoIn; - - /// - /// Controllo grViewLottoIn. - /// - /// - /// 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.GridView grViewLottoIn; - - /// - /// Controllo odsLottiIn. - /// - /// - /// 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 odsLottiIn; - - /// - /// Controllo hfHashList. - /// - /// - /// 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.HiddenField hfHashList; - - /// - /// Controllo hfJsonLotti. - /// - /// - /// 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.HiddenField hfJsonLotti; - } -}