diff --git a/.vs/MP-Site/v14/.suo b/.vs/MP-Site/v14/.suo index b6e985d4..86bd9338 100644 Binary files a/.vs/MP-Site/v14/.suo and b/.vs/MP-Site/v14/.suo differ diff --git a/MP-Site/DonatiPass-appSett.config b/MP-Site/DonatiPass-appSett.config index 9bcc9ab2..76dd0ab3 100644 --- a/MP-Site/DonatiPass-appSett.config +++ b/MP-Site/DonatiPass-appSett.config @@ -20,7 +20,6 @@ - @@ -36,7 +35,7 @@ - + diff --git a/MP-Site/WS/AutoCompletamento.asmx.cs b/MP-Site/WS/AutoCompletamento.asmx.cs index c64f2bc1..9bac2052 100644 --- a/MP-Site/WS/AutoCompletamento.asmx.cs +++ b/MP-Site/WS/AutoCompletamento.asmx.cs @@ -40,30 +40,6 @@ namespace MoonPro.WS } return suggerimenti.ToArray(); } - - - /// - /// elenco dei kanban per ricerca interattiva - /// - /// - [WebMethod(Description = "elenco dei kanban per ricerca interattiva")] - public string[] elencoKanban(string prefixText, int count) - { - // inizializzo risposta - List suggerimenti = new List(); - // 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(); - } - + } } diff --git a/MP-Site/Web.config b/MP-Site/Web.config index 5fdc4bea..0b52adc8 100644 --- a/MP-Site/Web.config +++ b/MP-Site/Web.config @@ -30,7 +30,6 @@ - @@ -40,7 +39,7 @@ - + diff --git a/MP-Site/WebUserControls/mod_UI.ascx.cs b/MP-Site/WebUserControls/mod_UI.ascx.cs index 5c218beb..8ed47485 100644 --- a/MP-Site/WebUserControls/mod_UI.ascx.cs +++ b/MP-Site/WebUserControls/mod_UI.ascx.cs @@ -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"); } diff --git a/MP-Site/WebUserControls/mod_listaStatiEventi.ascx b/MP-Site/WebUserControls/mod_listaStatiEventi.ascx index 25b86927..c0877e3c 100644 --- a/MP-Site/WebUserControls/mod_listaStatiEventi.ascx +++ b/MP-Site/WebUserControls/mod_listaStatiEventi.ascx @@ -68,9 +68,7 @@ - - + @@ -138,13 +136,11 @@ - + - + - diff --git a/MP-Site/WebUserControls/mod_listaStatiEventi.ascx.cs b/MP-Site/WebUserControls/mod_listaStatiEventi.ascx.cs index 39f81ba9..c9e9b53e 100644 --- a/MP-Site/WebUserControls/mod_listaStatiEventi.ascx.cs +++ b/MP-Site/WebUserControls/mod_listaStatiEventi.ascx.cs @@ -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) diff --git a/MP-Site/WebUserControls/mod_menuTop.ascx.cs b/MP-Site/WebUserControls/mod_menuTop.ascx.cs index 78ef3d73..d172caa1 100644 --- a/MP-Site/WebUserControls/mod_menuTop.ascx.cs +++ b/MP-Site/WebUserControls/mod_menuTop.ascx.cs @@ -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(); diff --git a/MP-Site/WebUserControls/mod_semaforo.ascx b/MP-Site/WebUserControls/mod_semaforo.ascx index c47c60cb..e369e8bd 100644 --- a/MP-Site/WebUserControls/mod_semaforo.ascx +++ b/MP-Site/WebUserControls/mod_semaforo.ascx @@ -8,7 +8,7 @@

- +
diff --git a/MP-Site/WebUserControls/mod_semaforo.ascx.cs b/MP-Site/WebUserControls/mod_semaforo.ascx.cs index f3348771..445b2d73 100644 --- a/MP-Site/WebUserControls/mod_semaforo.ascx.cs +++ b/MP-Site/WebUserControls/mod_semaforo.ascx.cs @@ -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(); } diff --git a/MP-Site/WebUserControls/mod_semaforo.ascx.designer.cs b/MP-Site/WebUserControls/mod_semaforo.ascx.designer.cs index 9acd4859..2f8b6e9c 100644 --- a/MP-Site/WebUserControls/mod_semaforo.ascx.designer.cs +++ b/MP-Site/WebUserControls/mod_semaforo.ascx.designer.cs @@ -31,13 +31,13 @@ namespace MoonPro.WebUserControls { protected global::System.Web.UI.WebControls.Label lblArt; /// - /// lblCodKanban control. + /// lblCodArticolo control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Label lblCodKanban; + protected global::System.Web.UI.WebControls.Label lblCodArticolo; /// /// lblOperatore control. diff --git a/MP-Site/WebUserControls/mod_sequencerStati.ascx.cs b/MP-Site/WebUserControls/mod_sequencerStati.ascx.cs index daec5c0a..333156fb 100644 --- a/MP-Site/WebUserControls/mod_sequencerStati.ascx.cs +++ b/MP-Site/WebUserControls/mod_sequencerStati.ascx.cs @@ -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; } } diff --git a/MP-Site/WebUserControls/mod_statoMacchina.ascx b/MP-Site/WebUserControls/mod_statoMacchina.ascx index 3393b709..fd2a00d3 100644 --- a/MP-Site/WebUserControls/mod_statoMacchina.ascx +++ b/MP-Site/WebUserControls/mod_statoMacchina.ascx @@ -10,10 +10,10 @@
- +
- +
diff --git a/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs index 60c8d475..fdedb737 100644 --- a/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs +++ b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs @@ -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 diff --git a/MP-Site/WebUserControls/mod_statoMacchina.ascx.designer.cs b/MP-Site/WebUserControls/mod_statoMacchina.ascx.designer.cs index ab3fc9ad..53274364 100644 --- a/MP-Site/WebUserControls/mod_statoMacchina.ascx.designer.cs +++ b/MP-Site/WebUserControls/mod_statoMacchina.ascx.designer.cs @@ -40,22 +40,22 @@ namespace MoonPro.WebUserControls { protected global::System.Web.UI.WebControls.LinkButton lnkMacchina; /// - /// lblCodKanban control. + /// lblCodArticolo control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Label lblCodKanban; + protected global::System.Web.UI.WebControls.Label lblCodArticolo; /// - /// valCodKanban control. + /// valCodArticolo control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Label valCodKanban; + protected global::System.Web.UI.WebControls.Label valCodArticolo; /// /// lblProd control. diff --git a/MP-Site/excelAllMacchineDatiConfermati.aspx.cs b/MP-Site/excelAllMacchineDatiConfermati.aspx.cs index 3862c335..6d59f1f2 100644 --- a/MP-Site/excelAllMacchineDatiConfermati.aspx.cs +++ b/MP-Site/excelAllMacchineDatiConfermati.aspx.cs @@ -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; diff --git a/MP-Site/excelAllMacchineExportEventi.aspx b/MP-Site/excelAllMacchineExportEventi.aspx index 3e8d7895..89252150 100644 --- a/MP-Site/excelAllMacchineExportEventi.aspx +++ b/MP-Site/excelAllMacchineExportEventi.aspx @@ -23,10 +23,9 @@ - + - diff --git a/MP-Site/excelAllMacchineExportEventi.aspx.cs b/MP-Site/excelAllMacchineExportEventi.aspx.cs index f5c23c62..0ba3f47d 100644 --- a/MP-Site/excelAllMacchineExportEventi.aspx.cs +++ b/MP-Site/excelAllMacchineExportEventi.aspx.cs @@ -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; diff --git a/MP-Site/excelAllMacchineExportEventi.aspx.designer.cs b/MP-Site/excelAllMacchineExportEventi.aspx.designer.cs index 94aea833..e4b9672c 100644 --- a/MP-Site/excelAllMacchineExportEventi.aspx.designer.cs +++ b/MP-Site/excelAllMacchineExportEventi.aspx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // 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. // //------------------------------------------------------------------------------ diff --git a/MP-Site/excelAllMacchineExportStati.aspx b/MP-Site/excelAllMacchineExportStati.aspx index 99a7f2d7..248f6d3e 100644 --- a/MP-Site/excelAllMacchineExportStati.aspx +++ b/MP-Site/excelAllMacchineExportStati.aspx @@ -23,8 +23,7 @@ - - + diff --git a/MP-Site/excelAllMacchineExportStati.aspx.cs b/MP-Site/excelAllMacchineExportStati.aspx.cs index 80c63b32..37bb38a3 100644 --- a/MP-Site/excelAllMacchineExportStati.aspx.cs +++ b/MP-Site/excelAllMacchineExportStati.aspx.cs @@ -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; diff --git a/MP-Site/excelAllMacchineExportStati.aspx.designer.cs b/MP-Site/excelAllMacchineExportStati.aspx.designer.cs index 2b60104d..3ecca14a 100644 --- a/MP-Site/excelAllMacchineExportStati.aspx.designer.cs +++ b/MP-Site/excelAllMacchineExportStati.aspx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // 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. // //------------------------------------------------------------------------------ diff --git a/MP-Site/excelExportDatiConfermati.aspx.cs b/MP-Site/excelExportDatiConfermati.aspx.cs index 46e4945a..e0c18621 100644 --- a/MP-Site/excelExportDatiConfermati.aspx.cs +++ b/MP-Site/excelExportDatiConfermati.aspx.cs @@ -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; diff --git a/MP-Site/excelExportEventi.aspx b/MP-Site/excelExportEventi.aspx index 73e6f9a6..d1810c56 100644 --- a/MP-Site/excelExportEventi.aspx +++ b/MP-Site/excelExportEventi.aspx @@ -23,10 +23,9 @@ - + - diff --git a/MP-Site/excelExportEventi.aspx.cs b/MP-Site/excelExportEventi.aspx.cs index e59a712f..dd2fbf2d 100644 --- a/MP-Site/excelExportEventi.aspx.cs +++ b/MP-Site/excelExportEventi.aspx.cs @@ -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; diff --git a/MP-Site/excelExportEventi.aspx.designer.cs b/MP-Site/excelExportEventi.aspx.designer.cs index 9614cf95..7d8fa2de 100644 --- a/MP-Site/excelExportEventi.aspx.designer.cs +++ b/MP-Site/excelExportEventi.aspx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // 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. // //------------------------------------------------------------------------------ diff --git a/MP-Site/excelExportStati.aspx b/MP-Site/excelExportStati.aspx index afecbdaf..06aa8934 100644 --- a/MP-Site/excelExportStati.aspx +++ b/MP-Site/excelExportStati.aspx @@ -23,8 +23,7 @@ - - + diff --git a/MP-Site/excelExportStati.aspx.cs b/MP-Site/excelExportStati.aspx.cs index 0d5ff95e..802b983e 100644 --- a/MP-Site/excelExportStati.aspx.cs +++ b/MP-Site/excelExportStati.aspx.cs @@ -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; diff --git a/MP-Site/excelExportStati.aspx.designer.cs b/MP-Site/excelExportStati.aspx.designer.cs index 4ffed1d0..cc86cf3c 100644 --- a/MP-Site/excelExportStati.aspx.designer.cs +++ b/MP-Site/excelExportStati.aspx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // 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. // //------------------------------------------------------------------------------ diff --git a/MapoDb/utility.cs b/MapoDb/utility.cs index c8fc6814..254ee1ea 100644 --- a/MapoDb/utility.cs +++ b/MapoDb/utility.cs @@ -231,7 +231,7 @@ public enum tipoBarcode /// /// identifica un cartellino di tipo CodArticolo /// - CodArticolo, + codArticolo, /// /// identifica un codice per le attività di inizio/fine attrezzaggio e inizio/fine produzione ///