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

cleanup vari di if false

Browse Source
This commit is contained in:
Samuele Locatelli
2022-03-04 11:44:45 +01:00
parent 4245a33f7f
commit 99f5c0b9dd
15 changed files with 3 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs
+1 -4
View File
@@ -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;
}
MP-MAG/BaseUserControl.cs
-50
View File
@@ -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<int, string> anagMateriali
{
set
{
string jsonData = JsonConvert.SerializeObject(value);
memLayer.ML.setRSV("anagMateriali", jsonData, 60);
}
get
{
Dictionary<int, string> answ = new Dictionary<int, string>();
//cerco in redis...
string rawData = memLayer.ML.getRSV("anagMateriali");
if (!string.IsNullOrEmpty(rawData))
{
answ = JsonConvert.DeserializeObject<Dictionary<int, string>>(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
}
}
MP-MAG/Controllers/HomeController.cs
-9
View File
@@ -17,14 +17,5 @@ namespace MP_MAG.Controllers
}
#endregion Public Methods
#if false
public ActionResult Index()
{
ViewBag.Title = "Home Page";
return View();
}
#endif
}
}
MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs
-21
View File
@@ -447,27 +447,6 @@ namespace MP_MAG.WebUserControls
/// <param name="resetStatus"></param>
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
MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs
-13
View File
@@ -214,19 +214,6 @@ namespace MP_MAG.WebUserControls
grView.DataBind();
}
#if false
/// <summary>
/// Avvia stampa report pedana
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
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
/// <summary>
/// comando reset
/// </summary>
MP-MAG/WebUserControls/cmp_prtFiniti.ascx.cs
+1 -136
View File
@@ -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 <b>C{cartRow.CartIndex}</b> ({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>B{binRow.BinIndex}</b> ({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
/// <summary>
/// Mostra o nasconde dettaglio su ITEM letto
/// </summary>
/// <param name="showItem"></param>
/// <param name="itemRow"></param>
/// <param name="showError"></param>
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
}
}
MP-MAG/WebUserControls/cmp_prtSemilav.ascx.cs
-147
View File
@@ -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 <b>C{cartRow.CartIndex}</b> ({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>B{binRow.BinIndex}</b> ({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
/// <param name="resetStatus"></param>
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
}
/// <summary>
@@ -602,76 +526,5 @@ namespace MP_MAG.WebUserControls
#endregion Protected Methods
#if false
/// <summary>
/// Mostra o nasconde dettaglio su ITEM letto
/// </summary>
/// <param name="showItem"></param>
/// <param name="itemRow"></param>
/// <param name="showError"></param>
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
}
}
MP-Site/WebUserControls/mod_sequencerTempiCiclo.ascx.cs
-45
View File
@@ -325,51 +325,6 @@ namespace MP_SITE.WebUserControls
#endregion Protected Methods
#if false
/// <summary>
/// popola il sequencer degli stati raggruppando perché troppi valori secondo MEDIA ARMONICA
/// </summary>
/// <param name="dati"></param>
/// <returns></returns>
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
/// <summary>
MP-TAB/DettaglioMacchina.aspx.cs
-50
View File
@@ -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)
MP-TAB/Test2.aspx.cs
-31
View File
@@ -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
}
}
MP-TAB/WebUserControls/cmp_dichiarList.ascx
+1 -37
View File
@@ -59,43 +59,7 @@
</asp:TemplateField>
</Columns>
</asp:GridView>
<%--<asp:TemplateField HeaderText="Registro Scarti <i class='fa fa-sort'></i>" SortExpression="DataOra" HeaderStyle-CssClass="btn btn-sm btn-block btn-secondary text-info" HeaderStyle-ForeColor="White">
<ItemTemplate>
<div class="row">
<div class="col-5 small">
<div>
Art: <b>
<asp:Label ID="Label5" runat="server" Text='<%# Eval("CodArticolo") %>' /></b>
</div>
<div>
<asp:Label ID="Label4" runat="server" CssClass='<%# "text-" + Eval("cssClass")%>'><i class='<%# Eval("icona") %>'></i> <%# Eval("Descrizione") %>'</asp:Label>
</div>
</div>
<div class="col-2 px-0 text-center">
<span class="lead font-weight-bold">
<%# Eval("Qta") %>
</span>pz
</div>
<div class="col-5 text-right small">
<div class="text-truncate">
<asp:Label ID="Label1" runat="server" Text='<%# Eval("DataOra","{0:ddd dd.MM.yy HH:mm:ss}") %>' />
<i class="fa fa-clock-o" aria-hidden="true"></i>
</div>
<div class="text-truncate">
<b>
<asp:Label ID="Label3" runat="server" Text='<%# Eval("Operatore") %>' /></b>
<i class="fa fa-user" aria-hidden="true"></i>
</div>
</div>
<div class="col-12 small">
<i runat="server" id="iNote" visible='<%# Eval("Note").ToString()!="" %>'>Nota:
<b>
<asp:Label ID="Label6" runat="server" Text='<%# Eval("Note") %>' /></b></i>
</div>
</div>
</ItemTemplate>
</asp:TemplateField>--%>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getFilt" TypeName="MapoDb.DS_applicazioneTableAdapters.DiarioDichiarazioniTableAdapter" DeleteMethod="deleteQuery" UpdateMethod="updateQuery" OnUpdating="ods_Updating">
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getFilt" TypeName="MapoDb.DS_applicazioneTableAdapters.DiarioDichiarazioniTableAdapter" DeleteMethod="deleteQuery" UpdateMethod="updateQuery" OnUpdating="ods_Updating" FilterExpression="">
<DeleteParameters>
<asp:Parameter Name="Original_IdxDich" Type="Int32" />
</DeleteParameters>
MagData/Objects.cs
-7
View File
@@ -96,13 +96,6 @@ namespace MagData
/// </summary>
public class prodPrintData
{
#if false
/// <summary>
/// Cod operatore corrente
/// </summary>
public string CodOpr { get; set; } = "";
#endif
#region Public Constructors
/// <summary>
MapoDb/AlarmsArchive.cs
-11
View File
@@ -11,11 +11,6 @@ namespace MapoDb
/// </summary>
public class AlarmsArchive
{
#if false
string mdbConnString = "mongodb://W2019-MONGODB:27017";
//string mdbConnString = "mongodb://localhost:27017";
MongoClient client;
#endif
/// <summary>
@@ -32,12 +27,6 @@ namespace MapoDb
/// </summary>
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();
}
MapoDb/FluxArchive.cs
-6
View File
@@ -44,12 +44,6 @@ namespace MapoDb
/// </summary>
public class FluxArchive
{
#if false
string mdbConnString = "mongodb://W2019-MONGODB:27017";
//string mdbConnString = "mongodb://localhost:27017";
MongoClient client;
#endif
#region Private Fields
/// <summary>
MapoDb/resoconti.cs
-11
View File
@@ -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;