diff --git a/MP-ADM/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj index 504d770a..4dfdf78e 100644 --- a/MP-ADM/MP-ADM.csproj +++ b/MP-ADM/MP-ADM.csproj @@ -599,7 +599,9 @@ + + @@ -931,6 +933,13 @@ cmp_numRow.ascx + + cmp_planStats_Art.ascx + ASPXCodeBehind + + + cmp_planStats_Art.ascx + cmp_planStats_Fasi.ascx ASPXCodeBehind @@ -938,6 +947,13 @@ cmp_planStats_Fasi.ascx + + cmp_planStats_Mac.ascx + ASPXCodeBehind + + + cmp_planStats_Mac.ascx + cmp_ST_detail.ascx ASPXCodeBehind diff --git a/MP-ADM/Planner.aspx b/MP-ADM/Planner.aspx index 8478f7bd..c011bcee 100644 --- a/MP-ADM/Planner.aspx +++ b/MP-ADM/Planner.aspx @@ -1,6 +1,5 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/MoonPro.master" AutoEventWireup="true" CodeBehind="Planner.aspx.cs" Inherits="MP_ADM.Planner" %> -<%@ Register Src="~/WebUserControls/mod_barcode.ascx" TagPrefix="uc1" TagName="mod_barcode" %> <%@ Register Src="~/WebUserControls/mod_planStats.ascx" TagPrefix="uc1" TagName="mod_planStats" %> <%@ Register Src="~/WebUserControls/mod_planCreate.ascx" TagPrefix="uc1" TagName="mod_planCreate" %> <%@ Register Src="~/WebUserControls/mod_gestPromODL_OUT.ascx" TagPrefix="uc1" TagName="mod_gestPromODL_OUT" %> diff --git a/MP-ADM/Planner.aspx.cs b/MP-ADM/Planner.aspx.cs index e874a7ea..fce40f25 100644 --- a/MP-ADM/Planner.aspx.cs +++ b/MP-ADM/Planner.aspx.cs @@ -5,17 +5,19 @@ namespace MP_ADM { public partial class Planner : BasePage { - protected void Page_Load(object sender, EventArgs e) + #region Private Methods + + private void checkEnabled() { - if (!Page.IsPostBack) + bool optPar = memLayer.ML.CRB("OptAdmKitEnabled"); + divContent.Visible = optPar; + lblDataImportOut.Visible = !optPar; + string messaggio = ""; + if (!optPar) { - toggleVisibility(); + messaggio = "Attenzione: Gestione KIT disabilitata"; + lblDataImportOut.Text = messaggio; } - checkEnabled(); - string codPre = memLayer.ML.CRS("OptAdmKit_CodPre"); - mod_planStats.eh_reset += Mod_planStats_eh_reset; - mod_planStats.eh_selVal += Mod_planStats_eh_selVal; - mod_planCreate.eh_ucev += Mod_planCreate_eh_ucev; } private void Mod_planCreate_eh_ucev(object sender, EventArgs e) @@ -34,9 +36,14 @@ namespace MP_ADM } } - protected void lbtToggle_Click(object sender, EventArgs e) + private void Mod_planStats_eh_reset(object sender, EventArgs e) { - toggleVisibility(); + fixSelStat(); + } + + private void Mod_planStats_eh_selVal(object sender, EventArgs e) + { + fixSelStat(); } private void toggleVisibility() @@ -45,15 +52,9 @@ namespace MP_ADM tgIcon.Attributes["class"] = divPromOUT.Visible ? "fa fa-chevron-up" : "fa fa-chevron-down"; } - private void Mod_planStats_eh_selVal(object sender, EventArgs e) - { - fixSelStat(); - } + #endregion Private Methods - private void Mod_planStats_eh_reset(object sender, EventArgs e) - { - fixSelStat(); - } + #region Protected Methods protected void fixSelStat() { @@ -63,56 +64,24 @@ namespace MP_ADM mod_planCreate.doUpdate(); } - private void checkEnabled() + protected void lbtToggle_Click(object sender, EventArgs e) { - bool optPar = memLayer.ML.CRB("OptAdmKitEnabled"); - divContent.Visible = optPar; - lblDataImportOut.Visible = !optPar; - string messaggio = ""; - if (!optPar) + toggleVisibility(); + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) { - messaggio = "Attenzione: Gestione KIT disabilitata"; - lblDataImportOut.Text = messaggio; + toggleVisibility(); } + checkEnabled(); + string codPre = memLayer.ML.CRS("OptAdmKit_CodPre"); + mod_planStats.eh_reset += Mod_planStats_eh_reset; + mod_planStats.eh_selVal += Mod_planStats_eh_selVal; + mod_planCreate.eh_ucev += Mod_planCreate_eh_ucev; } - private void Mod_gestKIT_eh_selKit(object sender, EventArgs e) - { -#if false - // invio ultimo kit creato a barcode... - mod_barcode.BCodeVal = mod_gestKIT.lastKitMade; - mod_barcode.processInput(); -#endif - } - - private void Mod_barcode_eh_dataRead(object sender, EventArgs e) - { -#if false - // verifico input su KIT x lettura "grezza" - string rawInput = mod_barcode.rawInput; - mod_gestKIT.lastInput = rawInput; - mod_gestKIT.doUpdate(); -#endif - } - - private void Mod_barcode_eh_comandoRegistrato(object sender, EventArgs e) - { -#if false - // verifico input su KIT x comando completo - string BCodeVal = mod_barcode.BCodeVal; - // se è un ORDINE... procedo! - if (BCodeVal.IndexOf("OPR") == 0) - { - // aggiungo ordine... - mod_gestKIT.addOrdArt(mod_barcode.codOrd, mod_barcode.codArt, mod_barcode.descArt, mod_barcode.qta); - mod_gestKIT.lastInput = ""; - } - else - { - mod_gestKIT.lastInput = mod_barcode.BCodeVal; - } - mod_gestKIT.doUpdate(); -#endif - } + #endregion Protected Methods } } \ No newline at end of file diff --git a/MP-ADM/WebUserControls/cmp_planStats_Art.ascx b/MP-ADM/WebUserControls/cmp_planStats_Art.ascx new file mode 100644 index 00000000..42a58dd4 --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_planStats_Art.ascx @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_planStats_Art.ascx.cs" Inherits="MP_ADM.WebUserControls.cmp_planStats_Art" %> diff --git a/MP-ADM/WebUserControls/cmp_planStats_Art.ascx.cs b/MP-ADM/WebUserControls/cmp_planStats_Art.ascx.cs new file mode 100644 index 00000000..8b75dde5 --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_planStats_Art.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 MP_ADM.WebUserControls +{ + public partial class cmp_planStats_Art : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/MP-ADM/WebUserControls/cmp_planStats_Art.ascx.designer.cs b/MP-ADM/WebUserControls/cmp_planStats_Art.ascx.designer.cs new file mode 100644 index 00000000..6faee8e9 --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_planStats_Art.ascx.designer.cs @@ -0,0 +1,16 @@ +//------------------------------------------------------------------------------ +// +// 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_ADM.WebUserControls +{ + public partial class cmp_planStats_Art + { + } +} diff --git a/MP-ADM/WebUserControls/cmp_planStats_Fasi.ascx b/MP-ADM/WebUserControls/cmp_planStats_Fasi.ascx index 6760f988..c906a490 100644 --- a/MP-ADM/WebUserControls/cmp_planStats_Fasi.ascx +++ b/MP-ADM/WebUserControls/cmp_planStats_Fasi.ascx @@ -2,7 +2,7 @@ <%@ Register Src="~/WebUserControls/cmp_numRow.ascx" TagPrefix="uc1" TagName="cmp_numRow" %> -
+

Reparti/Fasi

diff --git a/MP-ADM/WebUserControls/cmp_planStats_Fasi.ascx.cs b/MP-ADM/WebUserControls/cmp_planStats_Fasi.ascx.cs index d7e64307..1ebde56c 100644 --- a/MP-ADM/WebUserControls/cmp_planStats_Fasi.ascx.cs +++ b/MP-ADM/WebUserControls/cmp_planStats_Fasi.ascx.cs @@ -12,7 +12,7 @@ namespace MP_ADM.WebUserControls { #region Public Properties - public string selValue + public string SelCodGrp { get { diff --git a/MP-ADM/WebUserControls/cmp_planStats_Mac.ascx b/MP-ADM/WebUserControls/cmp_planStats_Mac.ascx new file mode 100644 index 00000000..d1d754f1 --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_planStats_Mac.ascx @@ -0,0 +1,40 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_planStats_Mac.ascx.cs" Inherits="MP_ADM.WebUserControls.cmp_planStats_Mac" %> + +<%@ Register Src="~/WebUserControls/cmp_numRow.ascx" TagPrefix="uc1" TagName="cmp_numRow" %> + + +
+
+

Macchine

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
\ No newline at end of file diff --git a/MP-ADM/WebUserControls/cmp_planStats_Mac.ascx.cs b/MP-ADM/WebUserControls/cmp_planStats_Mac.ascx.cs new file mode 100644 index 00000000..b038edf7 --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_planStats_Mac.ascx.cs @@ -0,0 +1,91 @@ +using SteamWare; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MP_ADM.WebUserControls +{ + public partial class cmp_planStats_Mac : BaseUserControl + { + #region Public Properties + + public string CodGrp + { + get + { + return hfCodGrp.Value; + } + set + { + hfCodGrp.Value = value; + } + } + + public string SelIdxMacchina + { + get + { + string answ = ""; + if (grView.SelectedIndex >= 0) + { + answ = $"{grView.SelectedValue}"; + } + return answ; + } + } + + #endregion Public Properties + + #region Private Methods + + private void Cmp_numRow_eh_newNum(object sender, EventArgs e) + { + grView.PageSize = cmp_numRow.numRowPag; + } + + #endregion Private Methods + + #region Protected Methods + + protected void grView_SelectedIndexChanged(object sender, EventArgs e) + { + raiseSelNew(); + } + + /// + /// comando reset + /// + /// + /// + protected void lbtReset_Click(object sender, EventArgs e) + { + doReset(); + raiseReset(); + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + cmp_numRow.numRowPag = memLayer.ML.CRI("_righeDataGridShort") / 2; + grView.PageSize = cmp_numRow.numRowPag; + } + cmp_numRow.eh_newNum += Cmp_numRow_eh_newNum; + } + + #endregion Protected Methods + + #region Public Methods + + public void doReset() + { + grView.SelectedIndex = -1; + grView.DataBind(); + } + + #endregion Public Methods + } +} \ No newline at end of file diff --git a/MP-ADM/WebUserControls/cmp_planStats_Mac.ascx.designer.cs b/MP-ADM/WebUserControls/cmp_planStats_Mac.ascx.designer.cs new file mode 100644 index 00000000..c02ecd01 --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_planStats_Mac.ascx.designer.cs @@ -0,0 +1,53 @@ +//------------------------------------------------------------------------------ +// +// 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_ADM.WebUserControls +{ + + + public partial class cmp_planStats_Mac + { + + /// + /// Controllo hfCodGrp. + /// + /// + /// 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 hfCodGrp; + + /// + /// Controllo grView. + /// + /// + /// 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 grView; + + /// + /// Controllo ods. + /// + /// + /// 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 ods; + + /// + /// Controllo cmp_numRow. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MP_ADM.WebUserControls.cmp_numRow cmp_numRow; + } +} diff --git a/MP-ADM/WebUserControls/mod_planStats.ascx b/MP-ADM/WebUserControls/mod_planStats.ascx index 7fc38826..9f931ee3 100644 --- a/MP-ADM/WebUserControls/mod_planStats.ascx +++ b/MP-ADM/WebUserControls/mod_planStats.ascx @@ -2,6 +2,7 @@ <%@ Register Src="~/WebUserControls/mod_ricercaGenerica.ascx" TagPrefix="uc1" TagName="mod_ricercaGenerica" %> <%@ Register Src="~/WebUserControls/cmp_numRow.ascx" TagPrefix="uc1" TagName="cmp_numRow" %> <%@ Register Src="~/WebUserControls/cmp_planStats_Fasi.ascx" TagPrefix="uc1" TagName="cmp_planStats_Fasi" %> +<%@ Register Src="~/WebUserControls/cmp_planStats_Mac.ascx" TagPrefix="uc1" TagName="cmp_planStats_Mac" %>
@@ -60,10 +61,10 @@ - <%----%> - + - + <%----%> +
@@ -73,42 +74,10 @@
-
+
- - - <%--
-
-

Reparti/Fasi

-
-
- - - - - - - - - - - - - - - - - - - - - -
-
- -
-
--%> -
+ + <%--

Macchine

@@ -135,15 +104,18 @@ - - <%----%> +
-
+
--%> + + + +
@@ -185,8 +157,7 @@ - - <%----%> + diff --git a/MP-ADM/WebUserControls/mod_planStats.ascx.cs b/MP-ADM/WebUserControls/mod_planStats.ascx.cs index 349ca418..8fac0536 100644 --- a/MP-ADM/WebUserControls/mod_planStats.ascx.cs +++ b/MP-ADM/WebUserControls/mod_planStats.ascx.cs @@ -49,7 +49,7 @@ namespace MP_ADM.WebUserControls catch { } return answ; #endif - return cmp_planStats_Fasi.selValue; + return cmp_planStats_Fasi.SelCodGrp; } } @@ -60,6 +60,7 @@ namespace MP_ADM.WebUserControls { get { +#if false string answ = ""; try { @@ -67,6 +68,8 @@ namespace MP_ADM.WebUserControls } catch { } return answ; +#endif + return cmp_planStats_Mac.SelIdxMacchina; } } @@ -79,10 +82,12 @@ namespace MP_ADM.WebUserControls gvParetoArt.PageSize = cmp_numRowArt.numRowPag; } +#if false private void Cmp_numRowMacc_eh_newNum(object sender, EventArgs e) { gvParetoMac.PageSize = cmp_numRowMacc.numRowPag; } +#endif #if false private void Cmp_numRowReparti_eh_newNum(object sender, EventArgs e) @@ -93,12 +98,33 @@ namespace MP_ADM.WebUserControls private void Cmp_planStats_Fasi_eh_resetSelezione(object sender, EventArgs e) { +#if false doReset(); +#endif + hfCodGrp.Value = "*"; + raiseEvent(tipoEvento.reset); } private void Cmp_planStats_Fasi_eh_selValore(object sender, EventArgs e) { - hlCodGrp.Value = cmp_planStats_Fasi.selValue; + string CodGrp = cmp_planStats_Fasi.SelCodGrp; + cmp_planStats_Mac.CodGrp = CodGrp; + hfCodGrp.Value = CodGrp; + } + + private void Cmp_planStats_Mac_eh_resetSelezione(object sender, EventArgs e) + { +#if false + doResetMac(); +#endif + hfIdxMacc.Value = "*"; + raiseEvent(tipoEvento.reset); + } + + private void Cmp_planStats_Mac_eh_selValore(object sender, EventArgs e) + { + string IdxMacc = cmp_planStats_Mac.SelIdxMacchina; + hfIdxMacc.Value = IdxMacc; } private void doResetArt() @@ -120,8 +146,11 @@ namespace MP_ADM.WebUserControls private void doResetMac() { + cmp_planStats_Mac.doReset(); +#if false gvParetoMac.SelectedIndex = -1; gvParetoMac.DataBind(); +#endif raiseEvent(tipoEvento.reset); } @@ -141,10 +170,12 @@ namespace MP_ADM.WebUserControls } #endif +#if false protected void gvParetoMac_SelectedIndexChanged(object sender, EventArgs e) { raiseEvent(tipoEvento.selection); } +#endif /// /// comando reset @@ -171,6 +202,7 @@ namespace MP_ADM.WebUserControls #endif +#if false /// /// comando reset /// @@ -180,6 +212,7 @@ namespace MP_ADM.WebUserControls { doResetMac(); } +#endif protected void lbtToggle_Click(object sender, EventArgs e) { @@ -193,25 +226,27 @@ namespace MP_ADM.WebUserControls { #if false cmp_numRowReparti.numRowPag = memLayer.ML.CRI("_righeDataGridShort") / 2; -#endif cmp_numRowMacc.numRowPag = memLayer.ML.CRI("_righeDataGridShort") / 2; +#endif cmp_numRowArt.numRowPag = memLayer.ML.CRI("_righeDataGridShort") / 2; #if false // sistemo i DataGrid... gvParetoGrp.PageSize = cmp_numRowReparti.numRowPag; -#endif gvParetoMac.PageSize = cmp_numRowMacc.numRowPag; +#endif gvParetoArt.PageSize = cmp_numRowArt.numRowPag; } - cmp_numRowArt.eh_newNum += Cmp_numRowArt_eh_newNum; - cmp_numRowMacc.eh_newNum += Cmp_numRowMacc_eh_newNum; + cmp_numRowArt.eh_newNum += Cmp_numRowArt_eh_newNum; #if false + cmp_numRowMacc.eh_newNum += Cmp_numRowMacc_eh_newNum; cmp_numRowReparti.eh_newNum += Cmp_numRowReparti_eh_newNum; #endif cmp_planStats_Fasi.eh_resetSelezione += Cmp_planStats_Fasi_eh_resetSelezione; cmp_planStats_Fasi.eh_selValore += Cmp_planStats_Fasi_eh_selValore; + cmp_planStats_Mac.eh_resetSelezione += Cmp_planStats_Mac_eh_resetSelezione; + cmp_planStats_Mac.eh_selValore += Cmp_planStats_Mac_eh_selValore; } /// diff --git a/MP-ADM/WebUserControls/mod_planStats.ascx.designer.cs b/MP-ADM/WebUserControls/mod_planStats.ascx.designer.cs index 4edd0a17..43dc4fcc 100644 --- a/MP-ADM/WebUserControls/mod_planStats.ascx.designer.cs +++ b/MP-ADM/WebUserControls/mod_planStats.ascx.designer.cs @@ -69,40 +69,31 @@ namespace MP_ADM.WebUserControls protected global::MP_ADM.WebUserControls.cmp_planStats_Fasi cmp_planStats_Fasi; /// - /// Controllo hlCodGrp. + /// Controllo cmp_planStats_Mac. /// /// /// 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 hlCodGrp; + protected global::MP_ADM.WebUserControls.cmp_planStats_Mac cmp_planStats_Mac; /// - /// Controllo gvParetoMac. + /// Controllo hfCodGrp. /// /// /// 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 gvParetoMac; + protected global::System.Web.UI.WebControls.HiddenField hfCodGrp; /// - /// Controllo odsStMac. + /// Controllo hfIdxMacc. /// /// /// 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 odsStMac; - - /// - /// Controllo cmp_numRowMacc. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::MP_ADM.WebUserControls.cmp_numRow cmp_numRowMacc; + protected global::System.Web.UI.WebControls.HiddenField hfIdxMacc; /// /// Controllo mod_ricercaGenerica.