diff --git a/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs b/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs index f51ddf87..62c4c3a8 100644 --- a/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs +++ b/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs @@ -395,10 +395,7 @@ namespace MP_ADM.WebUserControls enableChgPrio = ((priorita + delta) >= LPI && (priorita + delta) <= LPS); bool singleMachine = !string.IsNullOrEmpty(IdxMacchinaFilt) && IdxMacchinaFilt == IdxMacchina; -#if false - bool onlyProgrammed = chkUnassigned.Checked; - return enableChgPrio && onlyProgrammed && singleMachine; -#endif + return enableChgPrio && singleMachine; } diff --git a/MP-MAG/BaseUserControl.cs b/MP-MAG/BaseUserControl.cs index 8df38723..f2d5ee07 100644 --- a/MP-MAG/BaseUserControl.cs +++ b/MP-MAG/BaseUserControl.cs @@ -439,9 +439,6 @@ namespace MP_MAG bool answ = false; try { -#if false - currProdData = getProdDataDb; -#endif // rileggo prodPrintData newProdPrintData = MagDataLayerObj.currProdPrintData; // calcolo @@ -476,52 +473,5 @@ namespace MP_MAG #endregion Public Methods -#if false - protected Dictionary anagMateriali - { - set - { - string jsonData = JsonConvert.SerializeObject(value); - memLayer.ML.setRSV("anagMateriali", jsonData, 60); - } - get - { - Dictionary answ = new Dictionary(); - //cerco in redis... - string rawData = memLayer.ML.getRSV("anagMateriali"); - if (!string.IsNullOrEmpty(rawData)) - { - answ = JsonConvert.DeserializeObject>(rawData); - } - // sennò nel DB e salvo in redis... - else - { - var tabMat = DataLayer.man.taMat.GetData(); - foreach (var item in tabMat) - { - answ.Add(item.MatID, item.MatDesc); - } - // salvo in redis - anagMateriali = answ; - } - // restituisco - return answ; - } - } - - public string matByKey(object _matId) - { - string answ = ""; - int matId = 0; - int.TryParse(_matId.ToString(), out matId); - try - { - answ = anagMateriali[matId]; - } - catch - { } - return answ; - } -#endif } } \ No newline at end of file diff --git a/MP-MAG/Controllers/HomeController.cs b/MP-MAG/Controllers/HomeController.cs index 87d32a29..c2e86bf6 100644 --- a/MP-MAG/Controllers/HomeController.cs +++ b/MP-MAG/Controllers/HomeController.cs @@ -17,14 +17,5 @@ namespace MP_MAG.Controllers } #endregion Public Methods - -#if false - public ActionResult Index() - { - ViewBag.Title = "Home Page"; - - return View(); - } -#endif } } \ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs b/MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs index a8f7b160..b1e58dca 100644 --- a/MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs @@ -447,27 +447,6 @@ namespace MP_MAG.WebUserControls /// protected void resetSelection(bool resetStatus) { -#if false - if (resetStatus) - { - try - { - // SE item esiste... - var tabItem = DataLayer.man.taIL.getBySearch(itemIdSelected, itemIdSelected.ToString(), 0, 999); - if (tabItem.Count == 1) - { - // riposto item a status 1... - DataLayer.man.taIL.updateStatus(itemIdSelected, 1, PlaceId); - } - } - catch - { } - } - // elimino item sel... - itemIdSelected = 0; - resetShowData(); - ComLib.resetItemPickup(SheetID, DeviceId); -#endif } #endregion Protected Methods diff --git a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs index 707defb5..d2f03fc8 100644 --- a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs @@ -214,19 +214,6 @@ namespace MP_MAG.WebUserControls grView.DataBind(); } -#if false - /// - /// Avvia stampa report pedana - /// - /// - /// - protected void lbtPrintReport_Click(object sender, EventArgs e) - { - // lancio il report x l'elenco pedane + contenuto - MagDataLayerObj.taPJQ.insertQuery($"{tipoDocumento.docPackList}", $"{PackListID}", ddlPost.SelectedValue); - } -#endif - /// /// comando reset /// diff --git a/MP-MAG/WebUserControls/cmp_prtFiniti.ascx.cs b/MP-MAG/WebUserControls/cmp_prtFiniti.ascx.cs index e7745ac7..2f6ce6ef 100644 --- a/MP-MAG/WebUserControls/cmp_prtFiniti.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_prtFiniti.ascx.cs @@ -285,61 +285,6 @@ namespace MP_MAG.WebUserControls private void doUpdate() { -#if false - // reset grafico - icnCart.Attributes.Remove("class"); - icnCart.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary"); - icnBin.Attributes.Remove("class"); - icnBin.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary"); - icnSecOp.Attributes.Remove("class"); - icnSecOp.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary"); - - // in base al secondo mostro uno o altro... - if (showCart) - { - icnCart.Attributes.Remove("class"); - icnCart.Attributes.Add("class", "btn btn-sm btn-block btn-success"); - lblMessage.Text = "Item recognized"; - // controllo SE HO cart - if (currCartTab.Count == 1) - { - var cartRow = currCartTab[0]; - // imposto OUT - lblDestination.Text = $"SEND TO CART C{cartRow.CartIndex} ({cartRow.CartDtmx})"; - } - else - { - lblDestination.Text = $"ERROR SEARCHING CART: {currCartTab.Count} found!"; - } - lblDestination.CssClass = "text-success"; - } - else if (showBin) - { - icnBin.Attributes.Remove("class"); - icnBin.Attributes.Add("class", "btn btn-sm btn-block btn-primary"); - lblMessage.Text = "Item recognized"; - if (currBinTab.Count == 1) - { - var binRow = currBinTab[0]; - lblDestination.Text = $"SEND TO BIN B{binRow.BinIndex} ({binRow.BinDtmx})"; - } - else - { - lblDestination.Text = $"ERROR SEARCHING BIN: {currBinTab.Count} found!"; - } - lblDestination.CssClass = "text-primary"; - } - if (showSecOp) - { - icnSecOp.Attributes.Remove("class"); - icnSecOp.Attributes.Add("class", "btn btn-sm btn-block btn-info"); - lblMessage.Text = "Item recognized"; - lblLastBCode.Text = $"DO SEC OP: {secOp}"; - lblLastBCode.CssClass = "text-info"; - } - // fix btn reset! - lbtResetSel.Visible = (itemIdSelected != 0); -#endif } private bool processLastCmd(bool doRaiseEv) @@ -517,16 +462,7 @@ namespace MP_MAG.WebUserControls private void resetIcons() { -#if false - lblDestination.CssClass = "text-secondary"; - lblMessage.Text = ""; - lblDestination.Text = ""; - lblLastBCode.Text = ""; - lbtCancel.Visible = false; - lbtScrapped.Visible = false; - lbtParkArea.Visible = false; - lbtResetSel.Visible = (itemIdSelected != 0); -#endif + } #endregion Private Methods @@ -604,76 +540,5 @@ namespace MP_MAG.WebUserControls #endregion Protected Methods -#if false - /// - /// Mostra o nasconde dettaglio su ITEM letto - /// - /// - /// - /// - private void showItemDetail(bool showItem, DS_App.ItemListRow itemRow, bool showError) - { - resetShowData(); - divItemDet.Visible = showItem; - divItemError.Visible = showError; - if (showError) - { - displError("Item not found", true); - } - if (showItem) - { - lblItemCode.Text = itemRow.ItemExtCode; - lblItemDesc.Text = itemRow.ItemDesc; - lblItemDtmx.Text = itemRow.ItemDtmx; - itemIdSelected = itemRow.ItemID; - // CONTROLLO SIA in stato 1 --> worked, 2--> selected, 100--> parked... - switch (itemRow.StatusID) - { - case 0: - displError("ERROR: Item not ready", false); - break; - - case 1: - case 2: - case 100: - // salvo che è in STATO 2 (picked up) - DataLayer.man.taIL.updateStatus(itemRow.ItemID, 2, PlaceId); - // verifico cosa devo mostrare come PROX passaggio... - showCart = itemRow.ProcessesReq == ""; - showBin = (itemRow.ProcessesReq.Contains("PaintFlag")); - secOp = itemRow.PostProcList; - showSecOp = (secOp != ""); - doUpdate(); - break; - - case 3: - displError("Item already on CART!", false); - break; - - case 4: - // fino a concorrenza qta richiesta sposto, POI do errori - displError("ALL Item already scanned on BIN!", false); - break; - - case 5: - displError("Item already at KIT STATION!", false); - break; - - case 990: - displError("Item declared SCRAP!", false); - break; - - case 991: - displError("Item declared SCRAP with CNC program created!", false); - break; - - default: - displError("ERROR: Item status UNKNOWN!", false); - break; - } - } - lbtResetSel.Visible = (itemIdSelected != 0); - } -#endif } } \ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_prtSemilav.ascx.cs b/MP-MAG/WebUserControls/cmp_prtSemilav.ascx.cs index f80a99bd..7a479fe9 100644 --- a/MP-MAG/WebUserControls/cmp_prtSemilav.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_prtSemilav.ascx.cs @@ -283,61 +283,6 @@ namespace MP_MAG.WebUserControls private void doUpdate() { -#if false - // reset grafico - icnCart.Attributes.Remove("class"); - icnCart.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary"); - icnBin.Attributes.Remove("class"); - icnBin.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary"); - icnSecOp.Attributes.Remove("class"); - icnSecOp.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary"); - - // in base al secondo mostro uno o altro... - if (showCart) - { - icnCart.Attributes.Remove("class"); - icnCart.Attributes.Add("class", "btn btn-sm btn-block btn-success"); - lblMessage.Text = "Item recognized"; - // controllo SE HO cart - if (currCartTab.Count == 1) - { - var cartRow = currCartTab[0]; - // imposto OUT - lblDestination.Text = $"SEND TO CART C{cartRow.CartIndex} ({cartRow.CartDtmx})"; - } - else - { - lblDestination.Text = $"ERROR SEARCHING CART: {currCartTab.Count} found!"; - } - lblDestination.CssClass = "text-success"; - } - else if (showBin) - { - icnBin.Attributes.Remove("class"); - icnBin.Attributes.Add("class", "btn btn-sm btn-block btn-primary"); - lblMessage.Text = "Item recognized"; - if (currBinTab.Count == 1) - { - var binRow = currBinTab[0]; - lblDestination.Text = $"SEND TO BIN B{binRow.BinIndex} ({binRow.BinDtmx})"; - } - else - { - lblDestination.Text = $"ERROR SEARCHING BIN: {currBinTab.Count} found!"; - } - lblDestination.CssClass = "text-primary"; - } - if (showSecOp) - { - icnSecOp.Attributes.Remove("class"); - icnSecOp.Attributes.Add("class", "btn btn-sm btn-block btn-info"); - lblMessage.Text = "Item recognized"; - lblLastBCode.Text = $"DO SEC OP: {secOp}"; - lblLastBCode.CssClass = "text-info"; - } - // fix btn reset! - lbtResetSel.Visible = (itemIdSelected != 0); -#endif } private bool processLastCmd(bool doRaiseEv) @@ -566,27 +511,6 @@ namespace MP_MAG.WebUserControls /// protected void resetSelection(bool resetStatus) { -#if false - if (resetStatus) - { - try - { - // SE item esiste... - var tabItem = DataLayer.man.taIL.getBySearch(itemIdSelected, itemIdSelected.ToString(), 0, 999); - if (tabItem.Count == 1) - { - // riposto item a status 1... - DataLayer.man.taIL.updateStatus(itemIdSelected, 1, PlaceId); - } - } - catch - { } - } - // elimino item sel... - itemIdSelected = 0; - resetShowData(); - ComLib.resetItemPickup(SheetID, DeviceId); -#endif } /// @@ -602,76 +526,5 @@ namespace MP_MAG.WebUserControls #endregion Protected Methods -#if false - /// - /// Mostra o nasconde dettaglio su ITEM letto - /// - /// - /// - /// - private void showItemDetail(bool showItem, DS_App.ItemListRow itemRow, bool showError) - { - resetShowData(); - divItemDet.Visible = showItem; - divItemError.Visible = showError; - if (showError) - { - displError("Item not found", true); - } - if (showItem) - { - lblItemCode.Text = itemRow.ItemExtCode; - lblItemDesc.Text = itemRow.ItemDesc; - lblItemDtmx.Text = itemRow.ItemDtmx; - itemIdSelected = itemRow.ItemID; - // CONTROLLO SIA in stato 1 --> worked, 2--> selected, 100--> parked... - switch (itemRow.StatusID) - { - case 0: - displError("ERROR: Item not ready", false); - break; - - case 1: - case 2: - case 100: - // salvo che è in STATO 2 (picked up) - DataLayer.man.taIL.updateStatus(itemRow.ItemID, 2, PlaceId); - // verifico cosa devo mostrare come PROX passaggio... - showCart = itemRow.ProcessesReq == ""; - showBin = (itemRow.ProcessesReq.Contains("PaintFlag")); - secOp = itemRow.PostProcList; - showSecOp = (secOp != ""); - doUpdate(); - break; - - case 3: - displError("Item already on CART!", false); - break; - - case 4: - // fino a concorrenza qta richiesta sposto, POI do errori - displError("ALL Item already scanned on BIN!", false); - break; - - case 5: - displError("Item already at KIT STATION!", false); - break; - - case 990: - displError("Item declared SCRAP!", false); - break; - - case 991: - displError("Item declared SCRAP with CNC program created!", false); - break; - - default: - displError("ERROR: Item status UNKNOWN!", false); - break; - } - } - lbtResetSel.Visible = (itemIdSelected != 0); - } -#endif } } \ No newline at end of file diff --git a/MP-Site/WebUserControls/mod_sequencerTempiCiclo.ascx.cs b/MP-Site/WebUserControls/mod_sequencerTempiCiclo.ascx.cs index 52a7bf3f..99e145e0 100644 --- a/MP-Site/WebUserControls/mod_sequencerTempiCiclo.ascx.cs +++ b/MP-Site/WebUserControls/mod_sequencerTempiCiclo.ascx.cs @@ -325,51 +325,6 @@ namespace MP_SITE.WebUserControls #endregion Protected Methods -#if false - /// - /// popola il sequencer degli stati raggruppando perché troppi valori secondo MEDIA ARMONICA - /// - /// - /// - private void plottaGruppiMediaArmonica(DataLayer_generic.serieTimeValDataTable dati) - { - // creo oggetto x contenere i dati "mediati" - DataLayer_generic.serieTimeValDataTable datiGrouped = new DataLayer_generic.serieTimeValDataTable(); - // calcolo il val minimo da plottare (come ampiezza) - decimal ampiezzaMin = (decimal)totale / numSplit; - // setup valori iniziali - decimal valoreCurr = (decimal)0.0; - decimal valoreMedio = (decimal)1.0; - DateTime timeRaggiunto = _grafico.intervallo.inizio; - decimal ampiezzaCurr = (decimal)0.0; - decimal ampiezzaMedia = (decimal)0.0; - string label = ""; - // ciclo x tutti i record - foreach (DataLayer_generic.serieTimeValRow riga in dati) - { - // calcolo nuova ampiezza - ampiezzaCurr = (decimal)riga.DataEnd.Subtract(riga.DataStart).TotalMinutes; - //...e calcolo nuovo valore medio... - valoreCurr = riga.valore; - // calcolo media armonica - valoreMedio = ((ampiezzaCurr + ampiezzaMedia) / (ampiezzaMedia / valoreMedio + ampiezzaCurr / valoreCurr)); - ampiezzaMedia = ampiezzaCurr + ampiezzaMedia; - // se supero il limite aggiungo in tabella, sennò proseguo... - if (ampiezzaMedia > ampiezzaMin) - { - label = string.Format("TC: {0} min/pz", valoreMedio); - datiGrouped.AddserieTimeValRow(timeRaggiunto, riga.DataEnd, valoreMedio, label, "TC"); - // resetto - timeRaggiunto = riga.DataEnd; - ampiezzaMedia = (decimal)0.0; - valoreMedio = (decimal)1.0; - } - } - _grafico.palletChange = false; - plottaDettaglio(datiGrouped); - } -#endif - #region Public Methods /// diff --git a/MP-TAB/DettaglioMacchina.aspx.cs b/MP-TAB/DettaglioMacchina.aspx.cs index e99f93b4..94a74509 100644 --- a/MP-TAB/DettaglioMacchina.aspx.cs +++ b/MP-TAB/DettaglioMacchina.aspx.cs @@ -6,56 +6,6 @@ namespace MoonProTablet { public partial class DettaglioMacchina : BasePage { -#if false - protected int MatrOpr - { - get - { - return memLayer.ML.IntSessionObj("MatrOpr"); - } - } - - protected int QtaUdc - { - get - { - int answ = 1; - string codGrp = "IMB"; - string codVal = "NUM_PZ_CONT"; - // recupero dato da scheda tecnica della quantità per UDC - var tabSTAR = DataLayerObj.taSTAR.getByGrpOdlLbl(codGrp, codVal, idxODL); - if (tabSTAR.Rows.Count > 0) - { - try - { - int.TryParse(tabSTAR[0].Value, out answ); - } - catch - { } - } - return answ; - } - } - protected string UserAuthKey - { - get - { - //cerco in sessione... - string answ = memLayer.ML.StringSessionObj("UserAuthKey"); - // se non trovo --> db - if (string.IsNullOrEmpty(answ)) - { - var tabOpr = DataLayerObj.taOp.getByMatrOpr(MatrOpr); - if (tabOpr.Rows.Count > 0) - { - answ = tabOpr[0].authKey; - } - } - return answ; - } - } -#endif - #region Private Methods private void mod_confProd1_eh_newVal(object sender, EventArgs e) diff --git a/MP-TAB/Test2.aspx.cs b/MP-TAB/Test2.aspx.cs index f1fc05ca..82e6889f 100644 --- a/MP-TAB/Test2.aspx.cs +++ b/MP-TAB/Test2.aspx.cs @@ -37,42 +37,11 @@ namespace MoonProTablet divInnovazioni.Visible = showConf; if (showConf) { -#if false - // continuo update - lbtSalva.Visible = showConf; - lblUpdating.Visible = !showConf; -#endif -#if false - try - { - updatePzBuoni(); - // 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}", idxMacchinaSel), tipoLog.ERROR); - } -#endif - } - if (showConf) - { lblShowConfProd.Text = "Nascondi Conferma"; } else { lblShowConfProd.Text = "Mostra Conferma"; -#if false - // sollevo evento! - if (eh_reset != null) - { - eh_reset(this, new EventArgs()); - } -#endif } } diff --git a/MP-TAB/WebUserControls/cmp_dichiarList.ascx b/MP-TAB/WebUserControls/cmp_dichiarList.ascx index e1141432..d25300db 100644 --- a/MP-TAB/WebUserControls/cmp_dichiarList.ascx +++ b/MP-TAB/WebUserControls/cmp_dichiarList.ascx @@ -59,43 +59,7 @@ - <%-- - -
-
-
- Art: - -
-
- <%# Eval("Descrizione") %>' -
-
-
- - <%# Eval("Qta") %> - pz -
-
-
- - -
-
- - - -
-
-
- Nota: - - -
-
- - --%> - + diff --git a/MagData/Objects.cs b/MagData/Objects.cs index e5a7f07a..18dbb20b 100644 --- a/MagData/Objects.cs +++ b/MagData/Objects.cs @@ -96,13 +96,6 @@ namespace MagData /// public class prodPrintData { -#if false - /// - /// Cod operatore corrente - /// - public string CodOpr { get; set; } = ""; -#endif - #region Public Constructors /// diff --git a/MapoDb/AlarmsArchive.cs b/MapoDb/AlarmsArchive.cs index 93a1dc7e..0dafddce 100644 --- a/MapoDb/AlarmsArchive.cs +++ b/MapoDb/AlarmsArchive.cs @@ -11,11 +11,6 @@ namespace MapoDb /// public class AlarmsArchive { -#if false - string mdbConnString = "mongodb://W2019-MONGODB:27017"; - //string mdbConnString = "mongodb://localhost:27017"; - MongoClient client; -#endif /// @@ -32,12 +27,6 @@ namespace MapoDb /// public AlarmsArchive() { -#if false - // rifare avvio con lettura da web.config... - client = new MongoClient(mdbConnString); - database = client.GetDatabase("MAPO"); -#endif - database = memLayer.ML.getMongoDatabase("MAPO"); DataLayerObj = new DataLayer(); } diff --git a/MapoDb/FluxArchive.cs b/MapoDb/FluxArchive.cs index 4ae32152..a55c2122 100644 --- a/MapoDb/FluxArchive.cs +++ b/MapoDb/FluxArchive.cs @@ -44,12 +44,6 @@ namespace MapoDb /// public class FluxArchive { -#if false - string mdbConnString = "mongodb://W2019-MONGODB:27017"; - //string mdbConnString = "mongodb://localhost:27017"; - MongoClient client; -#endif - #region Private Fields /// diff --git a/MapoDb/resoconti.cs b/MapoDb/resoconti.cs index fec76769..3e0c7223 100644 --- a/MapoDb/resoconti.cs +++ b/MapoDb/resoconti.cs @@ -425,17 +425,6 @@ public class resoconti i++; } logger.lg.scriviLog(string.Format("Conversione oggetto eseguita: {0} rec, {1} msec", sequenza.Count, stopwatch.ElapsedMilliseconds)); -#if false - // faccio trim x primo evento... - if (_sequenza[0].start < _intervallo.inizio) - { - _sequenza.serieDati[0].valore -= _intervallo.inizio.Subtract(_sequenza.serieDati[0].timeData).TotalMinutes; - _sequenza.serieDati[0].timeData = _intervallo.inizio; - } - //...e ultimo evento... - int numValori = _sequenza.serieDati.Count - 1; - _sequenza.serieDati[numValori].valore = _intervallo.fine.Subtract(_sequenza.serieDati[numValori].timeData).TotalMinutes; -#endif } return sequenza;