Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Altro testing (insieme scarti/controlli e prod NON vanno)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-05-02 16:41:43 +02:00
parent cac77c6a88
commit 2bf8dba618
9 changed files with 154 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-Tablet/WebUserControls/mod_confProd.ascx
+29 -20
View File
@@ -26,7 +26,7 @@
<b>Dati Globali ODL</b>
</div>
<div class="col-4 text-right"><sub>(Inizio ODL --> <%: dtReqUpdate.ToString() %>)</sub></div>
<div class="col-4 pr-1 py-0 text-right">
<div class="col-6 col-sm-3 pr-1 py-0 text-right">
<div class="alert alert-info py-1">
<div class="text-truncate">
Pz Prodotti TOT [A+B+C]
@@ -36,20 +36,30 @@
</div>
</div>
</div>
<div class="col-4 px-1 py-0 text-right">
<div class="alert alert-danger py-1">
<div class="col-6 col-sm-3 pl-1 px-sm-1 py-0 text-right">
<div class="alert alert-warning py-1">
<div class="text-truncate">
[B] Scarti GIA' scaricati
[A] NUOVI Pz.Prod
</div>
<div style="font-size: 2em; font-weight: bold;" class="my-0">
<%: datiProdAct.PzConfScarto %>
<%: datiProdAct.Pz2RecTot %>
</div>
</div>
</div>
<div class="col-4 pl-1 py-0 text-right">
<div class="col-6 col-sm-3 pr-1 px-sm-1 py-0 text-right">
<div class="alert alert-danger py-1">
<div class="text-truncate">
[B] Scarti VERS + PEND
</div>
<div style="font-size: 2em; font-weight: bold;" class="my-0">
<%: datiProdAct.PzConfScarto %> + <%: datiProdAct.Pz2RecScarto %>
</div>
</div>
</div>
<div class="col-6 col-sm-3 pl-1 py-0 text-right">
<div class="alert alert-success py-1">
<div class="text-truncate">
[C] Pz Buoni VERSATI
[C] Pz Buoni VERS.
</div>
<div style="font-size: 2em; font-weight: bold;" class="my-0">
<%: datiProdAct.PzConfBuoni %>
@@ -57,32 +67,31 @@
</div>
</div>
</div>
<div class="row textCondens text-right bg-secondary">
<div class="row textCondens text-right bg-secondary" runat="server" id="divInnovazioni">
<div class="col-4"></div>
<div class="col-4 py-1 text-center text-uppercase">
<b>Dati Incrementali</b>
</div>
<div class="col-4 text-right"><sub>(ultima conferma --> <%: dtReqUpdate.ToString() %>)</sub></div>
<div class="col-4 pr-1">
<asp:Label runat="server" ID="lblNumPezzi" AssociatedControlID="txtNumPezzi" Text="[A] Pz Prodotti" />
<div class="col-3 pr-1">
<asp:Label runat="server" ID="lblNumPezzi" AssociatedControlID="txtNumPezzi" Text="Pz Prodotti" />
<asp:TextBox runat="server" ID="txtNumPezzi" Font-Size="XX-Large" TextMode="Number" CssClass="form-control text-right alert alert-info py-0" Enabled="false" AutoPostBack="True" OnTextChanged="txtNumPezzi_TextChanged" />
</div>
<div class="col-4 px-1">
<asp:Label runat="server" ID="lblNumScarti" AssociatedControlID="txtNumScarti" Text="Pz Scarto(-)" />
<div class="col-3 px-1">
<asp:Label runat="server" ID="lblNumScarti" AssociatedControlID="txtNumScarti" Text="Pz Scarto" />
<asp:TextBox runat="server" ID="txtNumScarti" Font-Size="XX-Large" TextMode="Number" CssClass="form-control text-right alert alert-danger py-0" Enabled="false" AutoPostBack="True" OnTextChanged="txtNumScarti_TextChanged" />
</div>
<div class="col-4 pl-1">
<asp:Label runat="server" ID="lblPzBuoni" AssociatedControlID="txtPzBuoni" Text="Pezzi Buoni" />
<div class="col-3 px-1">
<asp:Label runat="server" ID="lblPzBuoni" AssociatedControlID="txtPzBuoni" Text="Pz Buoni" />
<asp:TextBox runat="server" ID="txtPzBuoni" Font-Size="XX-Large" TextMode="Number" CssClass="form-control text-right alert alert-success py-0" Enabled="false" Text="---" />
</div>
</div>
<div class="row mt-2">
<div class="col-12">
<asp:LinkButton runat="server" ID="lbtSalva" Visible="false" CssClass="btn btn-warning text-light btn-lg btn-block" OnClick="lbtSalva_Click"><i class="fa fa-floppy-o"></i> CONFERMA</asp:LinkButton>
<div class="col-3 pl-1">
<asp:Label runat="server" ID="Label1" AssociatedControlID="txtPzBuoni" Text="-" />
<asp:LinkButton runat="server" ID="lbtSalva" Visible="false" CssClass="btn btn-success text-light btn-lg btn-block" OnClick="lbtSalva_Click"><i class="fa fa-floppy-o"></i> CONFERMA</asp:LinkButton>
</div>
</div>
<div class="row mb-2">
<div class="row my-2">
<div class="col-12">
<asp:Label runat="server" ID="lblOut" ForeColor="Red" />
</div>
</div>
</div>
MP-Tablet/WebUserControls/mod_confProd.ascx.cs
+20 -19
View File
@@ -182,7 +182,7 @@ namespace MoonProTablet.WebUserControls
/// <param name="e"></param>
protected void lbtShowConfProd_Click(object sender, EventArgs e)
{
switchBtnConferma(!txtNumPezzi.Enabled);
switchBtnConferma(!divInnovazioni.Visible);
}
/// <summary>
@@ -192,27 +192,27 @@ namespace MoonProTablet.WebUserControls
{
// aggiorno valori rilevati
updateProdData();
// continuo update
txtNumPezzi.Enabled = showConf;
txtNumScarti.Enabled = showConf;
lbtSalva.Visible = showConf;
DS_ProdTempi.stp_PzProd_getByMacchinaRow rigaProd;
rigaProd = DataLayer.obj.taPzProd2conf.GetData(idxMacchina)[0];
try
divInnovazioni.Visible = showConf;
if (showConf)
{
//numPzProdotti = rigaProd.pezziNonConfermati;
//numPzScarto = 0;
txtPzBuoni.Text = numPzConfermati.ToString();
// sollevo evento!
if (eh_inserting != null)
// continuo update
txtNumPezzi.Enabled = showConf;
txtNumScarti.Enabled = false;// showConf;
lbtSalva.Visible = showConf;
try
{
eh_inserting(this, new EventArgs());
txtPzBuoni.Text = numPzConfermati.ToString();
// sollevo evento!
if (eh_inserting != null)
{
eh_inserting(this, new EventArgs());
}
}
catch
{
txtNumPezzi.Text = "0";
logger.lg.scriviLog(string.Format("Errore recupero pezzi da confermare per la macchina {0}", idxMacchina), tipoLog.ERROR);
}
}
catch
{
txtNumPezzi.Text = "0";
logger.lg.scriviLog(string.Format("Errore recupero pezzi da confermare per la macchina {0}", idxMacchina), tipoLog.ERROR);
}
if (showConf)
{
@@ -381,5 +381,6 @@ namespace MoonProTablet.WebUserControls
memLayer.ML.setSessionVal("subMaccSel", value);
}
}
}
}
MP-Tablet/WebUserControls/mod_confProd.ascx.designer.cs
Generated
+18
View File
@@ -75,6 +75,15 @@ namespace MoonProTablet.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
/// <summary>
/// Controllo divInnovazioni.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divInnovazioni;
/// <summary>
/// Controllo lblNumPezzi.
/// </summary>
@@ -129,6 +138,15 @@ namespace MoonProTablet.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtPzBuoni;
/// <summary>
/// Controllo Label1.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Controllo lbtSalva.
/// </summary>
MP-Tablet/WebUserControls/mod_regScarti.ascx
+15 -27
View File
@@ -1,48 +1,36 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_regScarti.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_regScarti" %>
<div class="row">
<div class="col-12">
<asp:Label runat="server" ID="lblConfScarti" CssClass="btn btn-warning btn-lg btn-block disabled">
<asp:Label runat="server" ID="lblConfScarti" CssClass="btn btn-info btn-lg btn-block disabled">
<i class="fa fa-bug"></i> Registra SCARTI
</asp:Label>
<asp:Label runat="server" ID="lblMancaODL" Visible="false" ForeColor="Red">MANCA ODL: registrazione scarti produzione NON permessa</asp:Label>
<asp:LinkButton runat="server" ID="lbtShowScarti" OnClick="lbtShowContr_Click" CssClass="btn btn-warning btn-lg btn-block">
<asp:LinkButton runat="server" ID="lbtShowScarti" OnClick="lbtShowContr_Click" CssClass="btn btn-info btn-lg btn-block">
<i class="fa fa-bug"></i>
<asp:Label runat="server" ID="lblShowScarti" />
</asp:LinkButton>
</div>
<div class="col-12" runat="server" id="divSelMacc">
<asp:DropDownList runat="server" ID="ddlSubMacc" DataSourceID="ods" CssClass="form-control" DataTextField="CodMaccArticolo" DataValueField="IdxMacchina" AutoPostBack="True" OnSelectedIndexChanged="ddlSubMacc_SelectedIndexChanged" OnDataBound="ddlSubMacc_DataBound"></asp:DropDownList>
<asp:ObjectDataSource runat="server" ID="ods" OldValuesParameterFormatString="original_{0}" SelectMethod="getMulti" TypeName="MapoDb.DS_applicazioneTableAdapters.MSFDTableAdapter" FilterExpression="idxMacchina LIKE '%#%'">
<SelectParameters>
<asp:SessionParameter DefaultValue="0" Name="IdxMacchina" SessionField="IdxMacchina" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
</div>
<div class="row my-2" runat="server">
<div class="col-6">
<asp:LinkButton runat="server" ID="lbtOK" CssClass="btn btn-block btn-success" OnClick="lbtOK_Click">OK</asp:LinkButton>
<div class="row my-2" runat="server" id="divDetail">
<div class="col-4">
Data
</div>
<div class="col-4">
Ora
</div>
<div class="col-4">
NumPz
</div>
<div class="col-6">
<asp:LinkButton runat="server" ID="lbtKO" CssClass="btn btn-block btn-danger" OnClick="lbtKO_Click">KO</asp:LinkButton>
<asp:TextBox runat="server" ID="txtNote" />
</div>
<div class="col-12" runat="server" id="divNote" visible="false">
<asp:Label runat="server" ID="Label1" CssClass="small disabled" AssociatedControlID="txtNoteContr">
Note controllo NON superato (opzionali)
</asp:Label>
<asp:TextBox runat="server" ID="txtNoteContr" TextMode="MultiLine" CssClass="form-control"></asp:TextBox>
<asp:LinkButton runat="server" ID="lbtSalva" CssClass="btn btn-danger text-light btn-lg btn-block" OnClick="lbtSalva_Click"><i class="fa fa-floppy-o"></i> CONFERMA controllo KO</asp:LinkButton>
<div class="col-6">
BtnSalva
</div>
</div>
<div class="row mb-2">
<div class="col-12">
<asp:Label runat="server" ID="lblOut" ForeColor="Red" />
</div>
</div>
</div>
MP-Tablet/WebUserControls/mod_regScarti.ascx.cs
+21 -48
View File
@@ -35,7 +35,9 @@ namespace MoonProTablet.WebUserControls
private void checkAll()
{
fixSelMacc();
#if false
fixSelMacc();
#endif
checkOdl();
lblOut.Text = "";
switchBtnConferma(false);
@@ -54,6 +56,7 @@ namespace MoonProTablet.WebUserControls
/// <summary>
/// Verifica se la macchina MAIN sia MULTI (da DatiMacchina / redis...)
/// </summary>
#if false
protected bool isMulti
{
get
@@ -67,7 +70,8 @@ namespace MoonProTablet.WebUserControls
private void fixSelMacc()
{
divSelMacc.Visible = isMulti;
}
}
#endif
/// <summary>
/// restituisce css disabled SE odl NON OK...
/// </summary>
@@ -109,25 +113,16 @@ namespace MoonProTablet.WebUserControls
get
{
string answ = memLayer.ML.StringSessionObj("IdxMacchina");
// verifoc: se multi uso selettore tendina...
if (isMulti)
{
if (ddlSubMacc.SelectedValue == "")
{
ddlSubMacc.DataBind();
}
if (ddlSubMacc.SelectedValue != "")
{
answ = ddlSubMacc.SelectedValue;
}
}
return answ;
}
#if false
set
{
memLayer.ML.setSessionVal("IdxMacchina", value);
}
}
#endif
}
#if false
/// <summary>
/// idx macchina selezionata
/// </summary>
@@ -141,7 +136,8 @@ namespace MoonProTablet.WebUserControls
{
memLayer.ML.setSessionVal("IdxMacchina", value);
}
}
}
#endif
/// <summary>
/// cambio stato visibilità pannello e testo button
/// </summary>
@@ -149,16 +145,14 @@ namespace MoonProTablet.WebUserControls
/// <param name="e"></param>
protected void lbtShowContr_Click(object sender, EventArgs e)
{
switchBtnConferma(!lbtOK.Visible);
switchBtnConferma(!divDetail.Visible);
}
/// <summary>
/// determina comportamento btn conferma
/// </summary>
private void switchBtnConferma(bool showConf)
{
lbtOK.Visible = showConf;
lbtKO.Visible = showConf;
lbtSalva.Visible = showConf;
divDetail.Visible = showConf;
if (showConf)
{
lblShowScarti.Text = "Nascondi SCARTI";
@@ -180,8 +174,10 @@ namespace MoonProTablet.WebUserControls
/// <param name="e"></param>
protected void lbtSalva_Click(object sender, EventArgs e)
{
#if false
// salvo controllo KO
DataLayer.obj.taRC.insertQuery(idxMacchina, DataLayer.MatrOpr, false, txtNoteContr.Text.Trim(), DateTime.Now);
DataLayer.obj.taRC.insertQuery(idxMacchina, DataLayer.MatrOpr, false, txtNote.Text.Trim(), DateTime.Now);
#endif
// sollevo evento!
if (eh_newVal != null)
{
@@ -192,32 +188,11 @@ namespace MoonProTablet.WebUserControls
private void resetControlli()
{
txtNoteContr.Text = "";
txtNote.Text = "";
// nascondo!
switchBtnConferma(false);
divNote.Visible = false;
}
protected void ddlSubMacc_SelectedIndexChanged(object sender, EventArgs e)
{
subMaccSel = ddlSubMacc.SelectedValue;
checkAll();
}
protected void ddlSubMacc_DataBound(object sender, EventArgs e)
{
// se ho in memoria un valore LO REIMPOSTO...
if (subMaccSel != "")
{
// provo a preselezionare...
try
{
ddlSubMacc.SelectedValue = subMaccSel;
}
catch
{ }
}
}
/// <summary>
/// Sotto sistema (macchina) selezionato
/// </summary>
@@ -235,8 +210,10 @@ namespace MoonProTablet.WebUserControls
protected void lbtOK_Click(object sender, EventArgs e)
{
#if false
// Salvo controllo come OK
DataLayer.obj.taRC.insertQuery(idxMacchina, DataLayer.MatrOpr, true, "", DateTime.Now);
DataLayer.obj.taRC.insertQuery(idxMacchina, DataLayer.MatrOpr, true, "", DateTime.Now);
#endif
// sollevo evento!
if (eh_newVal != null)
{
@@ -245,9 +222,5 @@ namespace MoonProTablet.WebUserControls
resetControlli();
}
protected void lbtKO_Click(object sender, EventArgs e)
{
divNote.Visible = true;
}
}
}
MP-Tablet/WebUserControls/mod_regScarti.ascx.designer.cs
Generated
+4 -67
View File
@@ -49,85 +49,22 @@ namespace MoonProTablet.WebUserControls {
protected global::System.Web.UI.WebControls.Label lblShowScarti;
/// <summary>
/// Controllo divSelMacc.
/// Controllo divDetail.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSelMacc;
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDetail;
/// <summary>
/// Controllo ddlSubMacc.
/// Controllo txtNote.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlSubMacc;
/// <summary>
/// Controllo ods.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
/// <summary>
/// Controllo lbtOK.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtOK;
/// <summary>
/// Controllo lbtKO.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtKO;
/// <summary>
/// Controllo divNote.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divNote;
/// <summary>
/// Controllo Label1.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Controllo txtNoteContr.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtNoteContr;
/// <summary>
/// Controllo lbtSalva.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtSalva;
protected global::System.Web.UI.WebControls.TextBox txtNote;
/// <summary>
/// Controllo lblOut.