Fatta versione nuova x conferma prod

This commit is contained in:
Samuele E. Locatelli
2018-05-02 18:28:38 +02:00
parent 59240a38bb
commit 416339d198
9 changed files with 220 additions and 155 deletions
+12 -2
View File
@@ -27,9 +27,17 @@ namespace MoonProTablet
{
Session["TipoLink"] = "DetMacc";
}
mod_confProd1.eh_inserting += mod_confProd1_eh_inserting;
#if false
mod_confProd1.eh_inserting += mod_confProd1_eh_inserting;
#endif
mod_confProd1.eh_newVal += mod_confProd1_eh_newVal;
mod_confProd1.eh_reset += mod_confProd1_eh_reset;
mod_regScarti.eh_newVal += Mod_regScarti_eh_newVal;
}
private void Mod_regScarti_eh_newVal(object sender, EventArgs e)
{
mod_confProd1.doUpdate();
}
void mod_confProd1_eh_reset(object sender, EventArgs e)
@@ -40,9 +48,11 @@ namespace MoonProTablet
{
}
#if false
void mod_confProd1_eh_inserting(object sender, EventArgs e)
{
}
}
#endif
/// <summary>
/// evento timer
/// </summary>
+26 -16
View File
@@ -6,23 +6,23 @@
<b>Dati Globali ODL</b>
</div>
<div class="col-6 text-right"><sub>Inizio ODL --> <%: dtReqUpdate.ToString() %></sub></div>
<div class="col-6 col-sm-3 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]
</div>
<div style="font-size: 2em; font-weight: bold;" class="my-0">
<asp:label runat="server" ID="lblPzTotODL">[A+B+C]</asp:label>
<asp:Label runat="server" ID="lblPzTotODL">[A+B+C]</asp:Label>
</div>
</div>
</div>
<div class="col-6 col-sm-3 pl-1 px-sm-1 py-0 text-right">
<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">
[A] NUOVI Pz.Prod
</div>
<div style="font-size: 2em; font-weight: bold;" class="my-0">
<asp:label runat="server" ID="lblPz2RecTot">[A]</asp:label>
<asp:Label runat="server" ID="lblPz2RecTot">[A]</asp:Label>
</div>
</div>
</div>
@@ -32,7 +32,9 @@
[B] Scarti VERS + PEND
</div>
<div style="font-size: 2em; font-weight: bold;" class="my-0">
<asp:label runat="server" ID="lblPzConfScarto">[B1]</asp:label> + <asp:label runat="server" ID="lblPz2RecScarto">[B2]</asp:label>
<asp:Label runat="server" ID="lblPzConfScarto">[B1]</asp:Label>
+
<asp:Label runat="server" ID="lblPz2RecScarto">[B2]</asp:Label>
</div>
</div>
</div>
@@ -42,7 +44,7 @@
[C] Pz Buoni VERS.
</div>
<div style="font-size: 2em; font-weight: bold;" class="my-0">
<asp:label runat="server" ID="lblPzConfBuoni">[C]</asp:label>
<asp:Label runat="server" ID="lblPzConfBuoni">[C]</asp:Label>
</div>
</div>
</div>
@@ -78,19 +80,27 @@
<div class="col-6 text-right">
<sub>ultima conferma --> <%: dtReqUpdate.ToString() %></sub>
</div>
<div class="col-3 pr-1">
<div class="col-4 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" />
<asp:TextBox runat="server" ID="txtNumPezzi" Font-Size="XX-Large" TextMode="Number" CssClass="form-control text-right alert alert-info py-0" Enabled="true" AutoPostBack="True" OnTextChanged="txtNumPezzi_TextChanged" />
</div>
<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" />
<div class="col-4 px-1">
<div class="row">
<div class="col-5 pr-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 bg-dark text-danger py-0" Enabled="false" />
</div>
<div class="col-1 px-1">
<asp:Label runat="server" ID="Label2" AssociatedControlID="lblPlus" />
<asp:label runat="server" ID="lblPlus" Font-Size="XX-Large" TextMode="Number" Enabled="false">+</asp:label>
</div>
<div class="col-6 pl-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 bg-dark text-success py-0" Enabled="false" Text="---" />
</div>
</div>
</div>
<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 class="col-3 pl-1">
<div class="col-4 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>
@@ -49,13 +49,13 @@ namespace MoonProTablet.WebUserControls
if (!Page.IsPostBack)
{
checkAll();
updateProdData();
doUpdate();
}
}
/// <summary>
/// Aggiorno valori produzione...
/// </summary>
private void updateProdData()
public void doUpdate()
{
dtReqUpdate = DateTime.Now;
datiProdAct = DataLayer.obj.taStatoProd.GetData(idxMacchina, dtReqUpdate)[0];
@@ -156,7 +156,7 @@ namespace MoonProTablet.WebUserControls
answ = Convert.ToInt32(txtNumScarti.Text);
}
catch
{ }
{ }
return answ;
}
}
@@ -297,13 +297,11 @@ namespace MoonProTablet.WebUserControls
private void switchBtnConferma(bool showConf)
{
// aggiorno valori rilevati
updateProdData();
doUpdate();
divInnovazioni.Visible = showConf;
if (showConf)
{
// continuo update
txtNumPezzi.Enabled = showConf;
txtNumScarti.Enabled = false;// showConf;
lbtSalva.Visible = showConf;
try
{
+18
View File
@@ -165,6 +165,24 @@ namespace MoonProTablet.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtNumScarti;
/// <summary>
/// Controllo Label2.
/// </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 Label2;
/// <summary>
/// Controllo lblPlus.
/// </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 lblPlus;
/// <summary>
/// Controllo lblPzBuoni.
/// </summary>
@@ -1,38 +1,43 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_controlliProd.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_controlliProd" %>
<div class="row">
<div class="col-12">
<asp:Label runat="server" ID="lblConfProd" CssClass="btn btn-primary btn-lg btn-block disabled">
<div class="card">
<div class="card-header p-0">
<div class="row">
<div class="col-12">
<asp:Label runat="server" ID="lblConfProd" CssClass="btn btn-primary btn-lg btn-block disabled">
<i class="fa fa-wrench"></i> REGISTRA Controllo
</asp:Label>
<asp:Label runat="server" ID="lblMancaODL" Visible="false" ForeColor="Red">MANCA ODL: registrazione controlli produzione NON permessa</asp:Label>
<asp:LinkButton runat="server" ID="lbtShowContr" OnClick="lbtShowContr_Click" CssClass="btn btn-primary btn-lg btn-block">
<i class="fa fa-wrench"></i>
<asp:Label runat="server" ID="lblShowContr" />
</asp:LinkButton>
</asp:Label>
<asp:Label runat="server" ID="lblMancaODL" Visible="false" ForeColor="Red">MANCA ODL: registrazione controlli produzione NON permessa</asp:Label>
<asp:LinkButton runat="server" ID="lbtShowContr" OnClick="lbtShowContr_Click" CssClass="btn btn-primary btn-lg btn-block">
<i class="fa fa-wrench"></i>
<asp:Label runat="server" ID="lblShowContr" />
</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>
<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>
<div class="col-6">
<asp:LinkButton runat="server" ID="lbtKO" CssClass="btn btn-block btn-danger" OnClick="lbtKO_Click">KO</asp:LinkButton>
</div>
<div class="col-12" runat="server" id="divNote" visible="false">
<asp:Label runat="server" ID="Label1" CssClass="small disabled" AssociatedControlID="txtNoteContr">
<div class="card-body p-1 table-primary text-dark">
<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>
<div class="col-6">
<asp:LinkButton runat="server" ID="lbtKO" CssClass="btn btn-block btn-danger" OnClick="lbtKO_Click">KO</asp:LinkButton>
</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>
</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>
</div>
</div>
</div>
<div class="row mb-2">
+46 -26
View File
@@ -1,32 +1,52 @@
<%@ 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-info btn-lg btn-block disabled">
<div class="card">
<div class="card-header p-0">
<div class="row">
<div class="col-12">
<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-info btn-lg btn-block">
<i class="fa fa-bug"></i>
<asp:Label runat="server" ID="lblShowScarti" />
</asp:LinkButton>
</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-info btn-lg btn-block">
<i class="fa fa-bug"></i>
<asp:Label runat="server" ID="lblShowScarti" />
</asp:LinkButton>
</div>
</div>
</div>
</div>
<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:TextBox runat="server" ID="txtNote" />
</div>
<div class="col-6">
BtnSalva
<div class="card-body p-1 table-info text-dark">
<div class="row my-2 textCondens" runat="server" id="divDetail">
<div class="col-4">
<div class="text-truncate">
Num Pz
</div>
<div class="my-0">
<asp:TextBox runat="server" ID="txtNumPz" CssClass="form form-control" TextMode="Number" />
</div>
</div>
<div class="col-4">
<div class="text-truncate">
Data
</div>
<div class="my-0">
<asp:TextBox runat="server" ID="txtData" CssClass="form form-control" TextMode="Date" />
</div>
</div>
<div class="col-4">
<div class="text-truncate">
Ora
</div>
<div class="my-0">
<asp:TextBox runat="server" ID="txtOra" CssClass="form form-control" TextMode="Time" />
</div>
</div>
<div class="col-4">
<asp:LinkButton runat="server" ID="lbtSalva" CssClass="btn btn-success btn-block" OnClick="lbtSalva_Click"><i class="fa fa-floppy-o" aria-hidden="true"></i> Salva</asp:LinkButton>
</div>
<div class="col-8">
<asp:TextBox runat="server" ID="txtNote" CssClass="form form-control" placeholder="Note (opzionale)" />
</div>
</div>
</div>
</div>
<div class="row mb-2">
+39 -74
View File
@@ -35,15 +35,37 @@ namespace MoonProTablet.WebUserControls
private void checkAll()
{
#if false
fixSelMacc();
#endif
fixData();
checkOdl();
lblOut.Text = "";
switchBtnConferma(false);
lbtShowScarti.Visible = odlOk;
lblConfScarti.Visible = !odlOk;
}
private void fixData()
{
DateTime adesso = DateTime.Now;
txtData.Text = adesso.ToString("yyyy-MM-dd");
txtOra.Text = adesso.ToString("HH:mm");
numPzScarto = 1;
}
/// <summary>
/// Num pezzi scarto
/// </summary>
protected int numPzScarto
{
set
{
txtNumPz.Text = value.ToString();
}
get
{
int answ = 0;
int.TryParse(txtNumPz.Text, out answ);
return answ;
}
}
/// <summary>
/// Verifica se abbia un ODL ATTIVO
/// </summary>
@@ -56,22 +78,6 @@ namespace MoonProTablet.WebUserControls
/// <summary>
/// Verifica se la macchina MAIN sia MULTI (da DatiMacchina / redis...)
/// </summary>
#if false
protected bool isMulti
{
get
{
return DataLayer.isMulti(idxMacchinaSession);
}
}
/// <summary>
/// Se la machcina è MULTI --> mostro selettore
/// </summary>
private void fixSelMacc()
{
divSelMacc.Visible = isMulti;
}
#endif
/// <summary>
/// restituisce css disabled SE odl NON OK...
/// </summary>
@@ -115,29 +121,7 @@ namespace MoonProTablet.WebUserControls
string answ = memLayer.ML.StringSessionObj("IdxMacchina");
return answ;
}
#if false
set
{
memLayer.ML.setSessionVal("IdxMacchina", value);
}
#endif
}
#if false
/// <summary>
/// idx macchina selezionata
/// </summary>
public string idxMacchinaSession
{
get
{
return memLayer.ML.StringSessionObj("IdxMacchina");
}
set
{
memLayer.ML.setSessionVal("IdxMacchina", value);
}
}
#endif
/// <summary>
/// cambio stato visibilità pannello e testo button
/// </summary>
@@ -174,10 +158,20 @@ 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, txtNote.Text.Trim(), DateTime.Now);
#endif
// salvo registrazione scarto...
DateTime dataRif = DateTime.Now;
try
{
// ricompongo data dai 2 controlli
DateTime dateOnly;
DateTime timeOnly;
DateTime.TryParse(txtData.Text, out dateOnly);
DateTime.TryParse(txtOra.Text, out timeOnly);
dataRif = dateOnly.Add(timeOnly.TimeOfDay);
}
catch
{ }
DataLayer.obj.taRS.insertQuery(idxMacchina, dataRif, "ND", numPzScarto, txtNote.Text.Trim(), DataLayer.MatrOpr);
// sollevo evento!
if (eh_newVal != null)
{
@@ -193,34 +187,5 @@ namespace MoonProTablet.WebUserControls
switchBtnConferma(false);
}
/// <summary>
/// Sotto sistema (macchina) selezionato
/// </summary>
public string subMaccSel
{
get
{
return memLayer.ML.StringSessionObj("subMaccSel");
}
set
{
memLayer.ML.setSessionVal("subMaccSel", value);
}
}
protected void lbtOK_Click(object sender, EventArgs e)
{
#if false
// Salvo controllo come OK
DataLayer.obj.taRC.insertQuery(idxMacchina, DataLayer.MatrOpr, true, "", DateTime.Now);
#endif
// sollevo evento!
if (eh_newVal != null)
{
eh_newVal(this, new EventArgs());
}
resetControlli();
}
}
}
+36
View File
@@ -57,6 +57,42 @@ namespace MoonProTablet.WebUserControls {
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDetail;
/// <summary>
/// Controllo txtNumPz.
/// </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 txtNumPz;
/// <summary>
/// Controllo txtData.
/// </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 txtData;
/// <summary>
/// Controllo txtOra.
/// </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 txtOra;
/// <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;
/// <summary>
/// Controllo txtNote.
/// </summary>
+3
View File
@@ -47,6 +47,7 @@ namespace MapoDb
public DS_ProdTempiTableAdapters.MappaStatoExplTableAdapter taMSE;
public DS_ProdTempiTableAdapters.ProduzioneAs400TableAdapter taAs400;
public DS_ProdTempiTableAdapters.RegistroControlliTableAdapter taRC;
public DS_ProdTempiTableAdapters.RegistroScartiTableAdapter taRS;
public DS_ProdTempiTableAdapters.StatoProdTableAdapter taStatoProd;
// table adapter x utility
public DS_UtilityTableAdapters.v_selArticoliTableAdapter taSelArt;
@@ -90,6 +91,7 @@ namespace MapoDb
taMSE = new DS_ProdTempiTableAdapters.MappaStatoExplTableAdapter();
taAs400 = new DS_ProdTempiTableAdapters.ProduzioneAs400TableAdapter();
taRC = new DS_ProdTempiTableAdapters.RegistroControlliTableAdapter();
taRS = new DS_ProdTempiTableAdapters.RegistroScartiTableAdapter();
taStatoProd = new DS_ProdTempiTableAdapters.StatoProdTableAdapter();
taSelArt = new DS_UtilityTableAdapters.v_selArticoliTableAdapter();
taSelOdlFree = new DS_UtilityTableAdapters.v_selODLTableAdapter();
@@ -132,6 +134,7 @@ namespace MapoDb
taMSE.Connection.ConnectionString = connectionString;
taAs400.Connection.ConnectionString = connectionString;
taRC.Connection.ConnectionString = connectionString;
taRS.Connection.ConnectionString = connectionString;
taStatoProd.Connection.ConnectionString = connectionString;
taSelArt.Connection.ConnectionString = connectionString;
taSelOdlFree.Connection.ConnectionString = connectionString;