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

Pulizia da kanban x sito principale... DONE!

Browse Source
This commit is contained in:
Samuele E. Locatelli
2017-01-19 16:16:30 +01:00
parent a607043a44
commit e2d590b51e
30 changed files with 38 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/MP-Site/v14/.suo
BIN
View File
Binary file not shown.
MP-Site/DonatiPass-appSett.config
+1 -2
View File
@@ -20,7 +20,6 @@
<add key="_smtpCli" value="localhost" />
<add key="keepAliveMin" value="60" />
<add key="MinCharAutocomplete" value="1" />
<add key="_pdwUpdateKanban" value="colmecc" />
<add key="_pdwRefreshDb" value="steamware" />
<!--abilita auth solo con username-->
<add key="authSenzaDominio" value="true" />
@@ -36,7 +35,7 @@
<!--area codici per barcode, dichiarazioni operatore-->
<add key="prefDichOp" value="OP" />
<!--area codici per barcode, dichiarazioni operatore-->
<add key="prefDichKanban" value="KA" />
<add key="prefDichCodArt" value="KA" />
<!--area codici per barcode, attrezzaggi-->
<add key="prefDichAttrezzaggio" value="AT" />
<add key="StartSetup" value="AT02" />
MP-Site/WS/AutoCompletamento.asmx.cs
+1 -25
View File
@@ -40,30 +40,6 @@ namespace MoonPro.WS
}
return suggerimenti.ToArray();
}
/// <summary>
/// elenco dei kanban per ricerca interattiva
/// </summary>
/// <returns></returns>
[WebMethod(Description = "elenco dei kanban per ricerca interattiva")]
public string[] elencoKanban(string prefixText, int count)
{
// inizializzo risposta
List<string> suggerimenti = new List<string>();
// proseguo SOLO SE min "MinCharAutocomplete" char...
if (count >= memLayer.ML.confReadInt("MinCharAutocomplete"))
{
// elenco candidati
MapoDb.DS_Utility.v_selKanbanDataTable tabDati = MapoDb.DataLayer.obj.taSelKan.getByConditio(prefixText);
// aggiungo ogni riga...
foreach (MapoDb.DS_Utility.v_selKanbanRow riga in tabDati)
{
suggerimenti.Add(riga.value);
}
}
return suggerimenti.ToArray();
}
}
}
MP-Site/Web.config
+1 -2
View File
@@ -30,7 +30,6 @@
<add key="_smtpCli" value="localhost" />
<add key="keepAliveMin" value="10" />
<add key="MinCharAutocomplete" value="1" />
<add key="_pdwUpdateKanban" value="colmecc" />
<add key="_pdwRefreshDb" value="steamware" />
<add key="prefDichProd" value="XX" />
<add key="MostraProd" value="XXPRD" />
@@ -40,7 +39,7 @@
<add key="DiminuisciProd" value="XXM" />
<add key="prefDichFerm" value="FE" />
<add key="prefDichOp" value="OP" />
<add key="prefDichKanban" value="KA" />
<add key="prefDichCodArt" value="KA" />
<add key="prefDichAttrezzaggio" value="AT" />
<add key="StartSetup" value="AT02" />
<add key="EndSetup" value="AT01" />
MP-Site/WebUserControls/mod_UI.ascx.cs
+6 -7
View File
@@ -294,7 +294,7 @@ namespace MoonPro.WebUserControls
string prefDichProd = memLayer.ML.confReadString("prefDichProd");
string prefDichFerm = memLayer.ML.confReadString("prefDichFerm");
string prefDichOp = memLayer.ML.confReadString("prefDichOp");
string prefDichKanban = memLayer.ML.confReadString("prefDichKanban");
string prefDichCodArt = memLayer.ML.confReadString("prefDichCodArt");
string prefDichAttrezzaggio = memLayer.ML.confReadString("prefDichAttrezzaggio");
string prefModTurno = memLayer.ML.confReadString("prefModTurno");
_tipoBCode = tipoBarcode.nd;
@@ -312,9 +312,9 @@ namespace MoonPro.WebUserControls
{
_tipoBCode = tipoBarcode.matrOperatore;
}
else if (prefBarcode == prefDichKanban)
else if (prefBarcode == prefDichCodArt)
{
_tipoBCode = tipoBarcode.kanban;
_tipoBCode = tipoBarcode.codArticolo;
}
else if (prefBarcode == prefDichAttrezzaggio)
{
@@ -346,7 +346,7 @@ namespace MoonPro.WebUserControls
case tipoBarcode.matrOperatore:
processaCartellinoOperatore();
break;
case tipoBarcode.kanban:
case tipoBarcode.codArticolo:
// x ora non serve
break;
case tipoBarcode.attrezzaggio:
@@ -715,9 +715,8 @@ namespace MoonPro.WebUserControls
DS_applicazione.StatoMacchineRow rigaStato = DataLayer.obj.taStatoMacchine.GetDataByIdxMacchina(idxMacchina)[0];
// ricavo codice articolo...
string CodArticolo = DataLayer.obj.taODL.getByIdx(idxODL, false)[0].CodArticolo;
string MatrKanban = DataLayer.obj.taKanban.getByCodArt(CodArticolo)[0].MatricolaKanban;
// processo evento...
controllerMapo.scriviRigaEventoBarcode(idxMacchina, idxEvento, MatrKanban, "", rigaStato.MatrOpr, rigaStato.pallet);
controllerMapo.scriviRigaEventoBarcode(idxMacchina, idxEvento, CodArticolo, "", rigaStato.MatrOpr, rigaStato.pallet);
// ricarico a seconda del tipo di codice
if (BarCode.StartsWith(StartSetup))
{
@@ -763,7 +762,7 @@ namespace MoonPro.WebUserControls
{
DS_applicazione.StatoMacchineRow rigaStato = DataLayer.obj.taStatoMacchine.GetDataByIdxMacchina(idxMacchina)[0];
// processo evento...
controllerMapo.scriviRigaEventoBarcode(idxMacchina, idxEvento, rigaStato.MatricolaKanban, "", rigaStato.MatrOpr, rigaStato.pallet);
controllerMapo.scriviRigaEventoBarcode(idxMacchina, idxEvento, rigaStato.CodArticolo, "", rigaStato.MatrOpr, rigaStato.pallet);
// ricarico!
salvaRicarica("Dichiarazione fermata", "Registrata dichiarazione fermata");
}
MP-Site/WebUserControls/mod_listaStatiEventi.ascx
+3 -7
View File
@@ -68,9 +68,7 @@
<asp:Label ID="lblDurata" runat="server" Text='<%# durataEvento(Eval("DurataMinuti")) %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="KanbanCode" HeaderText="Articolo" SortExpression="KanbanCode" />
<asp:BoundField DataField="MatricolaKanban" HeaderText="Kanban" SortExpression="MatricolaKanban"
Visible="False" />
<asp:BoundField DataField="CodArticolo" HeaderText="Articolo" SortExpression="CodArticolo" />
<asp:BoundField DataField="pallet" HeaderText="Pallet" SortExpression="pallet" Visible="False" />
<asp:TemplateField HeaderText="Operatore" SortExpression="MatrOpr">
<ItemTemplate>
@@ -138,13 +136,11 @@
<asp:Label ID="lblEvento" runat="server" Text='<%# tipoDaIdx(Eval("IdxTipo")) %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Articolo" SortExpression="MatricolaKanban">
<asp:TemplateField HeaderText="Articolo" SortExpression="CodArticolo">
<ItemTemplate>
<asp:Label ID="lblEvento" runat="server" Text='<%# kanbanDaIdx(Eval("MatricolaKanban")) %>' />
<asp:Label ID="lblEvento" runat="server" Text='<%# Eval("CodArticolo") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="MatricolaKanban" HeaderText="Kanban" SortExpression="MatricolaKanban"
Visible="False" />
<asp:BoundField DataField="pallet" HeaderText="pallet" SortExpression="pallet" Visible="False" />
<asp:TemplateField HeaderText="Operatore" SortExpression="MatrOpr">
<ItemTemplate>
MP-Site/WebUserControls/mod_listaStatiEventi.ascx.cs
-12
View File
@@ -96,18 +96,6 @@ namespace MoonPro.WebUserControls
{
return _resoconti.tipoDaIdx(Convert.ToInt32(idx));
}
public string kanbanDaIdx(object idx)
{
string answ = "";
try
{
DS_applicazione.KanbanRow riga = _resoconti.kanbanDaIdx(idx.ToString());
answ = riga.KanbanCode;
}
catch
{ }
return answ;
}
public void aggiornamento()
{
if (memLayer.ML.confReadInt("_logLevel") > 5)
MP-Site/WebUserControls/mod_menuTop.ascx.cs
-9
View File
@@ -186,15 +186,6 @@ namespace MoonPro.WebUserControls
{
return string.Format("{0:d} - {0:HH.mm.ss}", DateTime.Now);
}
protected void lnkUpdateKanban_Click(object sender, EventArgs e)
{
Response.Redirect("./caricaUpdateKanban.aspx");
}
protected void lnkUpdateOpr_Click(object sender, EventArgs e)
{
Response.Redirect("./caricaUpdateOperatori.aspx");
}
protected void HiddenHeight_ValueChanged(object sender, EventArgs e)
{
updateWindowSize();
MP-Site/WebUserControls/mod_semaforo.ascx
+1 -1
View File
@@ -8,7 +8,7 @@
<div style="float: left;" width="30%">
<asp:Label runat="server" ID="lblArt" Text="Art." />
<br />
<asp:Label ID="lblCodKanban" runat="server" Font-Size="20pt" />
<asp:Label ID="lblCodArticolo" runat="server" Font-Size="20pt" />
</div>
<div style="float: right;" width="30%"">
<asp:Label runat="server" ID="lblOperatore" Text="Oper." />
MP-Site/WebUserControls/mod_semaforo.ascx.cs
+1 -2
View File
@@ -58,7 +58,7 @@ namespace MoonPro.WebUserControls
lblDurata.Text = traduci("DurataStato");
// valori
lblMacchina.Text = tabMacchine.FindByIdxMacchina(IdxMacchina).Nome;
lblCodKanban.Text = tabStatoMacchine.FindByIdxMacchina(IdxMacchina).KanbanCode;
lblCodArticolo.Text = tabStatoMacchine.FindByIdxMacchina(IdxMacchina).CodArticolo;
int matrOper = tabStatoMacchine.FindByIdxMacchina(IdxMacchina).MatrOpr;
DS_applicazione.AnagraficaOperatoriRow rigaOper = DataLayer.obj.taOp.getByMatrOpr(matrOper)[0];
lblOper.Text = string.Format("{0} {1}", rigaOper.Cognome, rigaOper.Nome);
@@ -160,7 +160,6 @@ namespace MoonPro.WebUserControls
tabMacchine = MapoDb.DataLayer.obj.taMacchine.GetData();
tabStatoMacchine = MapoDb.DataLayer.obj.taStatoMacchine.GetData();
tabAnagStati = MapoDb.DataLayer.obj.taAnagStati.GetData();
//tabKanban = taKanban.GetData();
tabKeepAlive = MapoDb.DataLayer.obj.taKeepAlive.GetData();
}
MP-Site/WebUserControls/mod_semaforo.ascx.designer.cs
Generated
+2 -2
View File
@@ -31,13 +31,13 @@ namespace MoonPro.WebUserControls {
protected global::System.Web.UI.WebControls.Label lblArt;
/// <summary>
/// lblCodKanban control.
/// lblCodArticolo control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblCodKanban;
protected global::System.Web.UI.WebControls.Label lblCodArticolo;
/// <summary>
/// lblOperatore control.
MP-Site/WebUserControls/mod_sequencerStati.ascx.cs
+4 -4
View File
@@ -257,7 +257,7 @@ namespace MoonPro.WebUserControls
double valV = 0.0;
double valS = 0.0;
DateTime _t_0 = new DateTime(9999, 1, 1);
string _mostKanban = "";
string _mostCodArticolo = "";
int _maxVal = 0;
string colore;
foreach (DataLayer_generic.serieDatiRow riga in dati)
@@ -270,7 +270,7 @@ namespace MoonPro.WebUserControls
if (riga.valore > _maxVal)
{
_maxVal = Convert.ToInt32(riga.valore);
_mostKanban = riga.label;
_mostCodArticolo = riga.label;
}
valRigaCum = valRigaCum + riga.valore;
// accumulo valori...
@@ -314,12 +314,12 @@ namespace MoonPro.WebUserControls
valG = 0.0;
}
// salvo riga dati
datiGrouped.AddserieDatiRow(valRigaCum, colore, _mostKanban, _t_0);
datiGrouped.AddserieDatiRow(valRigaCum, colore, _mostCodArticolo, _t_0);
// reset dei contatori...
valRigaCum = 0.0;
_t_0 = new DateTime(9999, 1, 1);
_mostKanban = "";
_mostCodArticolo = "";
_maxVal = 0;
}
}
MP-Site/WebUserControls/mod_statoMacchina.ascx
+2 -2
View File
@@ -10,10 +10,10 @@
<asp:LinkButton ID="lnkMacchina" runat="server" OnClick="lnkMacchina_Click">
<div class="clearDiv">
<div class="floSx">
<asp:Label ID="lblCodKanban" runat="server" />
<asp:Label ID="lblCodArticolo" runat="server" />
</div>
<div class="floDx">
<asp:Label ID="valCodKanban" runat="server" />
<asp:Label ID="valCodArticolo" runat="server" />
</div>
</div>
<div class="clearDiv">
MP-Site/WebUserControls/mod_statoMacchina.ascx.cs
+2 -3
View File
@@ -48,13 +48,13 @@ namespace MoonPro.WebUserControls
if (_IdxMacchina != "nd")
{
// labels
lblCodKanban.Text = "Articolo"; // era kanban
lblCodArticolo.Text = "Articolo";
lblStato.Text = "Stato";
lblProd.Text = "T.Ciclo medio"; // era OEE
lblDurata.Text = "Durata";
// valori
valMacchina.Text = tabMacchine.FindByIdxMacchina(IdxMacchina).Nome;
valCodKanban.Text = tabStatoMacchine.FindByIdxMacchina(IdxMacchina).KanbanCode;
valCodArticolo.Text = tabStatoMacchine.FindByIdxMacchina(IdxMacchina).CodArticolo;
// carico ultimo stato che sia durato almeno 6 sec (0.1 min)
int idxStato = 0;
int oreTot = 0;
@@ -263,7 +263,6 @@ namespace MoonPro.WebUserControls
tabMacchine = MapoDb.DataLayer.obj.taMacchine.GetData();
tabStatoMacchine = MapoDb.DataLayer.obj.taStatoMacchine.GetData();
tabAnagStati = MapoDb.DataLayer.obj.taAnagStati.GetData();
//tabKanban = taKanban.GetData();
tabKeepAlive = MapoDb.DataLayer.obj.taKeepAlive.GetData();
}
catch
MP-Site/WebUserControls/mod_statoMacchina.ascx.designer.cs
Generated
+4 -4
View File
@@ -40,22 +40,22 @@ namespace MoonPro.WebUserControls {
protected global::System.Web.UI.WebControls.LinkButton lnkMacchina;
/// <summary>
/// lblCodKanban control.
/// lblCodArticolo control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblCodKanban;
protected global::System.Web.UI.WebControls.Label lblCodArticolo;
/// <summary>
/// valCodKanban control.
/// valCodArticolo control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label valCodKanban;
protected global::System.Web.UI.WebControls.Label valCodArticolo;
/// <summary>
/// lblProd control.
MP-Site/excelAllMacchineDatiConfermati.aspx.cs
+1 -6
View File
@@ -105,12 +105,7 @@ public partial class excelAllMacchineDatiConfermati : System.Web.UI.Page
{
return _resoconti.macchinaDaIdx(idx.ToString());
}
public string kanbanDaIdx(object idx)
{
DS_applicazione.KanbanRow riga = _resoconti.kanbanDaIdx(idx.ToString());
return riga.KanbanCode;
}
public void aggiornamento()
{
gvDatiConf.AllowPaging = false;
MP-Site/excelAllMacchineExportEventi.aspx
+1 -2
View File
@@ -23,10 +23,9 @@
</asp:TemplateField>
<asp:TemplateField HeaderText="Articolo">
<ItemTemplate>
<asp:Label ID="lblArticolo" runat="server" Text='<%# kanbanDaIdx(Eval("MatricolaKanban")) %>' />
<asp:Label ID="lblArticolo" runat="server" Text='<%# Eval("CodArticolo") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="MatricolaKanban" HeaderText="Kanban" />
<asp:BoundField DataField="pallet" HeaderText="Pallet"/>
<asp:TemplateField HeaderText="Operatore">
<ItemTemplate>
MP-Site/excelAllMacchineExportEventi.aspx.cs
-6
View File
@@ -105,12 +105,6 @@ public partial class excelAllMacchineExportEventi : System.Web.UI.Page
{
return _resoconti.macchinaDaIdx(idx.ToString());
}
public string kanbanDaIdx(object idx)
{
DS_applicazione.KanbanRow riga = _resoconti.kanbanDaIdx(idx.ToString());
return riga.KanbanCode;
}
public void aggiornamento()
{
gvEventi.AllowPaging = false;
MP-Site/excelAllMacchineExportEventi.aspx.designer.cs
Generated
+1 -2
View File
@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4927
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
MP-Site/excelAllMacchineExportStati.aspx
+1 -2
View File
@@ -23,8 +23,7 @@
<asp:Label ID="Label1" runat="server" Text='<%# durataEvento(Eval("DurataMinuti")) %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="KanbanCode" HeaderText="Articolo" />
<asp:BoundField DataField="MatricolaKanban" HeaderText="Kanban" />
<asp:BoundField DataField="CodArticolo" HeaderText="Articolo" />
<asp:BoundField DataField="pallet" HeaderText="Pallet" />
<asp:TemplateField HeaderText="Operatore" >
<ItemTemplate>
MP-Site/excelAllMacchineExportStati.aspx.cs
-5
View File
@@ -105,11 +105,6 @@ public partial class excelAllMacchineExportStati : System.Web.UI.Page
{
return _resoconti.tipoDaIdx(Convert.ToInt32(idx));
}
public string kanbanDaIdx(object idx)
{
DS_applicazione.KanbanRow riga = _resoconti.kanbanDaIdx(idx.ToString());
return riga.KanbanCode;
}
public void aggiornamento()
{
gvStati.AllowPaging = false;
MP-Site/excelAllMacchineExportStati.aspx.designer.cs
Generated
+1 -2
View File
@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4927
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
MP-Site/excelExportDatiConfermati.aspx.cs
-6
View File
@@ -104,12 +104,6 @@ public partial class excelExportDatiConfermati : System.Web.UI.Page
{
return _resoconti.macchinaDaIdx(idx.ToString());
}
public string kanbanDaIdx(object idx)
{
DS_applicazione.KanbanRow riga = _resoconti.kanbanDaIdx(idx.ToString());
return riga.KanbanCode;
}
public void aggiornamento()
{
gvDatiConf.AllowPaging = false;
MP-Site/excelExportEventi.aspx
+1 -2
View File
@@ -23,10 +23,9 @@
</asp:TemplateField>
<asp:TemplateField HeaderText="Articolo">
<ItemTemplate>
<asp:Label ID="lblEvento" runat="server" Text='<%# kanbanDaIdx(Eval("MatricolaKanban")) %>' />
<asp:Label ID="lblCodArticolo" runat="server" Text='<%# Eval("CodArticolo") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="MatricolaKanban" HeaderText="Kanban" />
<asp:BoundField DataField="pallet" HeaderText="Pallet"/>
<asp:TemplateField HeaderText="Operatore">
<ItemTemplate>
MP-Site/excelExportEventi.aspx.cs
-6
View File
@@ -105,12 +105,6 @@ public partial class excelExportEventi : System.Web.UI.Page
{
return _resoconti.macchinaDaIdx(idx.ToString());
}
public string kanbanDaIdx(object idx)
{
DS_applicazione.KanbanRow riga = _resoconti.kanbanDaIdx(idx.ToString());
return riga.KanbanCode;
}
public void aggiornamento()
{
gvEventi.AllowPaging = false;
MP-Site/excelExportEventi.aspx.designer.cs
Generated
+1 -2
View File
@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4927
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
MP-Site/excelExportStati.aspx
+1 -2
View File
@@ -23,8 +23,7 @@
<asp:Label ID="Label1" runat="server" Text='<%# durataEvento(Eval("DurataMinuti")) %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="KanbanCode" HeaderText="Articolo" />
<asp:BoundField DataField="MatricolaKanban" HeaderText="Kanban" />
<asp:BoundField DataField="CodArticolo" HeaderText="Articolo" />
<asp:BoundField DataField="pallet" HeaderText="Pallet" />
<asp:TemplateField HeaderText="Operatore">
<ItemTemplate>
MP-Site/excelExportStati.aspx.cs
-5
View File
@@ -105,11 +105,6 @@ public partial class excelExportStati : System.Web.UI.Page
{
return _resoconti.tipoDaIdx(Convert.ToInt32(idx));
}
public string kanbanDaIdx(object idx)
{
DS_applicazione.KanbanRow riga = _resoconti.kanbanDaIdx(idx.ToString());
return riga.KanbanCode;
}
public void aggiornamento()
{
gvStati.AllowPaging = false;
MP-Site/excelExportStati.aspx.designer.cs
Generated
+1 -2
View File
@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4927
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
MapoDb/utility.cs
+1 -1
View File
@@ -231,7 +231,7 @@ public enum tipoBarcode
/// <summary>
/// identifica un cartellino di tipo CodArticolo
/// </summary>
CodArticolo,
codArticolo,
/// <summary>
/// identifica un codice per le attività di inizio/fine attrezzaggio e inizio/fine produzione
/// </summary>