From 3d1c083a63dcf666356acd4747779d9dc8176bc7 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 27 Jan 2021 08:15:59 +0100 Subject: [PATCH] inizio riorganizzaizone ultimo modulo --- MP-ADM/WebUserControls/cmp_PODL_OUT.ascx | 1 + MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs | 17 +++++++++++++++++ .../cmp_PODL_OUT.ascx.designer.cs | 16 ++++++++++++++++ MP-ADM/WebUserControls/cmp_planApprove.ascx | 11 ++++------- MP-ADM/WebUserControls/cmp_planApprove.ascx.cs | 17 ++++++----------- 5 files changed, 44 insertions(+), 18 deletions(-) create mode 100644 MP-ADM/WebUserControls/cmp_PODL_OUT.ascx create mode 100644 MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs create mode 100644 MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.designer.cs diff --git a/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx b/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx new file mode 100644 index 00000000..11c0e60a --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_PODL_OUT.ascx.cs" Inherits="MP_ADM.WebUserControls.cmp_PODL_OUT" %> diff --git a/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs b/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs new file mode 100644 index 00000000..da175387 --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_PODL_OUT.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_PODL_OUT : 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_PODL_OUT.ascx.designer.cs b/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.designer.cs new file mode 100644 index 00000000..7cd2b52b --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_PODL_OUT.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_PODL_OUT + { + } +} diff --git a/MP-ADM/WebUserControls/cmp_planApprove.ascx b/MP-ADM/WebUserControls/cmp_planApprove.ascx index 54b682b6..39513e4f 100644 --- a/MP-ADM/WebUserControls/cmp_planApprove.ascx +++ b/MP-ADM/WebUserControls/cmp_planApprove.ascx @@ -99,14 +99,11 @@ <%----%> -
- -
- -
+ +   +
+
- <%-- - --%> diff --git a/MP-ADM/WebUserControls/cmp_planApprove.ascx.cs b/MP-ADM/WebUserControls/cmp_planApprove.ascx.cs index dca974b3..1b8765d9 100644 --- a/MP-ADM/WebUserControls/cmp_planApprove.ascx.cs +++ b/MP-ADM/WebUserControls/cmp_planApprove.ascx.cs @@ -98,7 +98,7 @@ namespace MP_ADM.WebUserControls { // update valori calcolati in base a selezione... int numOrd = 0; - int numPzOrd = 0; + int QtaRem = 0; decimal tempoMinOrd = 0; decimal tc50p = 0; int numPzTot = 0; @@ -107,18 +107,18 @@ namespace MP_ADM.WebUserControls string CodArt = ""; foreach (GridViewRow riga in grView.Rows) { - numPzOrd = 0; + QtaRem = 0; tempoMinOrd = 0; DateTime DataRif = DateTime.Now.Date; if (((CheckBox)riga.FindControl("chkSelect")).Checked && ((CheckBox)riga.FindControl("chkSelect")).Visible) { try { - int.TryParse(((TextBox)riga.FindControl("txtNumPezzi")).Text, out numPzOrd); + int.TryParse(((Label)riga.FindControl("lblQtaRem")).Text, out QtaRem); decimal.TryParse(((Label)riga.FindControl("lblTC50p")).Text, out tc50p); - tempoMinOrd = tc50p * numPzOrd; + tempoMinOrd = tc50p * QtaRem; CodArt = ((Label)riga.FindControl("lblCodArticolo")).Text; - if (numPzOrd > 0) numOrd++; + if (QtaRem > 0) numOrd++; // salvo dictionary articoli... if (ElArticoli.ContainsKey(CodArt)) { @@ -131,7 +131,7 @@ namespace MP_ADM.WebUserControls } catch { } - numPzTot += numPzOrd; + numPzTot += QtaRem; tempoMinTot += tempoMinOrd; } } @@ -339,11 +339,6 @@ namespace MP_ADM.WebUserControls cmp_numRow.eh_newNum += Cmp_numRow_eh_newNum; } - protected void txtNumPezzi_TextChanged(object sender, EventArgs e) - { - calcTotali(); - } - #endregion Protected Methods #region Public Methods