diff --git a/AppData/DataLayer.cs b/AppData/DataLayer.cs index fee43c2..7a4d7aa 100644 --- a/AppData/DataLayer.cs +++ b/AppData/DataLayer.cs @@ -140,12 +140,10 @@ namespace AppData #endregion -#if false /// /// oggetto static/singleton per fare chiamate sul datalayer /// - public static DataLayer man = new DataLayer(); -#endif + protected DataLayer DLMan = new DataLayer(); public string CodSoggCurrUser { @@ -339,7 +337,7 @@ namespace AppData // recupero da DB... try { - var tabPost = DataLayer.man.taElPos.getByKey(codPost); + var tabPost = DLMan.taElPos.getByKey(codPost); if (tabPost.Count == 1) { printer = tabPost[0].stampante; diff --git a/AppData/reportPrinter.cs b/AppData/reportPrinter.cs index d842498..3792543 100644 --- a/AppData/reportPrinter.cs +++ b/AppData/reportPrinter.cs @@ -18,6 +18,11 @@ namespace AppData { #region area codice da non modificare + /// + /// oggetto static/singleton per fare chiamate sul datalayer + /// + protected DataLayer DLMan = new DataLayer(); + private int m_currentPageIndex; protected int logLevel = 0; protected bool doPdfCopy = false; @@ -150,31 +155,31 @@ namespace AppData { case reportRichiesto.binPost: int.TryParse(keyParam, out intIdx); - tab = (DataTable)DataLayer.man.taRepBin.GetData(intIdx, true, imagePath, qrCodeBaseUrl); + tab = (DataTable)DLMan.taRepBin.GetData(intIdx, true, imagePath, qrCodeBaseUrl); break; case reportRichiesto.binPre: int.TryParse(keyParam, out intIdx); - tab = (DataTable)DataLayer.man.taRepBin.GetData(intIdx, false, imagePath, qrCodeBaseUrl); + tab = (DataTable)DLMan.taRepBin.GetData(intIdx, false, imagePath, qrCodeBaseUrl); break; case reportRichiesto.bunkGroup: int.TryParse(keyParam, out intIdx); - tab = (DataTable)DataLayer.man.taRepBunkGroup.GetData(intIdx, qrCodeBaseUrl); + tab = (DataTable)DLMan.taRepBunkGroup.GetData(intIdx, qrCodeBaseUrl); break; case reportRichiesto.bunkList: int.TryParse(keyParam, out intIdx); - tab = (DataTable)DataLayer.man.taRepBunkList.GetData(intIdx, qrCodeBaseUrl); + tab = (DataTable)DLMan.taRepBunkList.GetData(intIdx, qrCodeBaseUrl); break; case reportRichiesto.cart: int.TryParse(keyParam, out intIdx); - tab = (DataTable)DataLayer.man.taRepCart.GetData(intIdx, qrCodeBaseUrl); + tab = (DataTable)DLMan.taRepCart.GetData(intIdx, qrCodeBaseUrl); break; case reportRichiesto.offline: int.TryParse(keyParam, out intIdx); - tab = (DataTable)DataLayer.man.taRepPart.GetData(intIdx, qrCodeBaseUrl); + tab = (DataTable)DLMan.taRepPart.GetData(intIdx, qrCodeBaseUrl); break; case reportRichiesto.part: int.TryParse(keyParam, out intIdx); - tab = (DataTable)DataLayer.man.taRepPart.GetData(intIdx, qrCodeBaseUrl); + tab = (DataTable)DLMan.taRepPart.GetData(intIdx, qrCodeBaseUrl); break; default: break; @@ -285,7 +290,7 @@ namespace AppData } else { - DataLayer.man.taPJQ.insertQuery(documento.ToString(), keyParam, printerName); + DLMan.taPJQ.insertQuery(documento.ToString(), keyParam, printerName); } if (queueOnly) { @@ -303,7 +308,7 @@ namespace AppData } else { - nextJob = DataLayer.man.taPJQ.getNext()[0].KeyParam; + nextJob = DLMan.taPJQ.getNext()[0].KeyParam; } } catch @@ -317,7 +322,7 @@ namespace AppData } else { - DataLayer.man.taPJQ.chiudiZoombie(DateTime.Now.AddMilliseconds(-memLayer.ML.CRI("zombieMsTime"))); + DLMan.taPJQ.chiudiZoombie(DateTime.Now.AddMilliseconds(-memLayer.ML.CRI("zombieMsTime"))); } // ora inizio a fare le mie stampe... Random rand = new Random(); @@ -331,7 +336,7 @@ namespace AppData } else { - DataLayer.man.taPJQ.updateLastTry(keyParam); + DLMan.taPJQ.updateLastTry(keyParam); } // aspetto... msWait = rand.Next(memLayer.ML.confReadInt("minWait"), memLayer.ML.confReadInt("maxWait")); @@ -343,7 +348,7 @@ namespace AppData } else { - nextJob = DataLayer.man.taPJQ.getNext()[0].KeyParam; + nextJob = DLMan.taPJQ.getNext()[0].KeyParam; } } // salvo idx job... @@ -355,7 +360,7 @@ namespace AppData } else { - idxPrintJob = DataLayer.man.taPJQ.getNext()[0].IdxPrintJob; + idxPrintJob = DLMan.taPJQ.getNext()[0].IdxPrintJob; } } catch (Exception exc) @@ -417,7 +422,7 @@ namespace AppData } else { - DataLayer.man.taPJQ.updateStato(idxPrintJob, 1); + DLMan.taPJQ.updateStato(idxPrintJob, 1); } } else @@ -429,7 +434,7 @@ namespace AppData } else { - DataLayer.man.taPJQ.updateStato(idxPrintJob, -1); + DLMan.taPJQ.updateStato(idxPrintJob, -1); } } diff --git a/NKC_WF/BaseUserControl.cs b/NKC_WF/BaseUserControl.cs index cc48101..b57247d 100644 --- a/NKC_WF/BaseUserControl.cs +++ b/NKC_WF/BaseUserControl.cs @@ -71,7 +71,7 @@ namespace NKC_WF // sennò nel DB e salvo in redis... else { - var tabMat = DataLayer.man.taMat.GetData(); + var tabMat = DLMan.taMat.GetData(); foreach (var item in tabMat) { answ.Add(item.MatID, item.MatDesc); diff --git a/NKC_WF/Controllers/BatchProcController.cs b/NKC_WF/Controllers/BatchProcController.cs index 8148352..3e0f7c2 100644 --- a/NKC_WF/Controllers/BatchProcController.cs +++ b/NKC_WF/Controllers/BatchProcController.cs @@ -11,6 +11,11 @@ namespace NKC_WF.Controllers public class BatchProcController : ApiController { + /// + /// oggetto static/singleton per fare chiamate sul datalayer + /// + protected DataLayer DLMan = new DataLayer(); + /// /// Restituisce SE C'E' la richiesta di elaborazione BATCH corrente /// @@ -105,7 +110,7 @@ namespace NKC_WF.Controllers // deserializzo. baseNestAnsw batchProcAnsw = JsonConvert.DeserializeObject(content); // procedura idempotente: elimino eventuali dati della "busta" precedente... - DataLayer.man.taEL.deteteByParent("", batchProcAnsw.EnvNum); + DLMan.taEL.deteteByParent("", batchProcAnsw.EnvNum); // se ho errori inizio a salvarli... if (batchProcAnsw.ErrorList.Count > 0) { @@ -113,7 +118,7 @@ namespace NKC_WF.Controllers foreach (var item in batchProcAnsw.ErrorList) { // salvo log errore... - DataLayer.man.taEL.insertQuery(DateTime.Now, item.ErrType, $"{batchProcAnsw.EnvNum}", $"{item.Uid}", $"{item.Description}"); + DLMan.taEL.insertQuery(DateTime.Now, item.ErrType, $"{batchProcAnsw.EnvNum}", $"{item.Uid}", $"{item.Description}"); } } // se non nullo... @@ -139,7 +144,7 @@ namespace NKC_WF.Controllers // recupero info sul batch / KIT specifico x capire se sia di tipo "validation" bool isValidation = false; - var tabOrd = DataLayer.man.taOL.getByBatch(rispStima.BatchID); + var tabOrd = DLMan.taOL.getByBatch(rispStima.BatchID); if (tabOrd.Count > 0) { isValidation = tabOrd[0].OrdType == "V"; @@ -205,19 +210,19 @@ namespace NKC_WF.Controllers break; } // SALVO info riguardo al batch running - DataLayer.man.taBL.updateStatus(rispStima.BatchID, bStatus, rispStima.EnvNum, (decimal)rispStima.EstimatedWorktime / 60); + DLMan.taBL.updateStatus(rispStima.BatchID, bStatus, rispStima.EnvNum, (decimal)rispStima.EstimatedWorktime / 60); // salvo udpate elenco ITEMS ComLib.updatePartsFromNesting(rispStima.PartList); // aggiorno cadPath x items che non abbiano valorizzato... string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}{memLayer.ML.CRS("drawingFolder")}/"; - DataLayer.man.taIL.updateCadPath(cadBasePath, rispStima.BatchID, false); + DLMan.taIL.updateCadPath(cadBasePath, rispStima.BatchID, false); // verifico IN CASO di validazione andata a buon fine --> valorizzo tabella! if (bStatus > 7) { // recupero ordine da batch if (tabOrd.Count > 0) { - DataLayer.man.taIV.upsertQuery(tabOrd[0].OrderExtCode, rispStima.BatchID, bStatus, rispStima.EstimatedWorktime); + DLMan.taIV.upsertQuery(tabOrd[0].OrderExtCode, rispStima.BatchID, bStatus, rispStima.EstimatedWorktime); } } // registro OK @@ -260,9 +265,9 @@ namespace NKC_WF.Controllers if (rispNest.ProcessStatus == procStatus.completed || rispNest.ProcessStatus == procStatus.error) { // resetto le precedenti elaborazioni: elimino dati child MA NON il batch... - DataLayer.man.taBL.resetTree(rispNest.BatchID); + DLMan.taBL.resetTree(rispNest.BatchID); // SALVO info riguardo al batch completato - DataLayer.man.taBL.updateStatus(rispNest.BatchID, bStatus, rispNest.EnvNum, (decimal)rispNest.EstimatedWorktime / 60); + DLMan.taBL.updateStatus(rispNest.BatchID, bStatus, rispNest.EnvNum, (decimal)rispNest.EstimatedWorktime / 60); // salvo info riguardo ai vari Bunk / Sheets / Items... ComLib.updateBunksFromNesting(rispNest.BatchID, rispNest.BunkList); // salvo info x CART & BINS previsti @@ -301,7 +306,7 @@ namespace NKC_WF.Controllers if (rispOffOrd.ProcessStatus == procStatus.error) { // status -1 --> ERRORE!!! - DataLayer.man.taOffOL.updateStatus(Math.Abs(rispOffOrd.BatchID), -1); + DLMan.taOffOL.updateStatus(Math.Abs(rispOffOrd.BatchID), -1); } else { @@ -310,7 +315,7 @@ namespace NKC_WF.Controllers string fixPathDraw = rispOffOrd.DrawingPath.ToLower().Replace(nestBasePath, servBasePath).Replace('/','\\'); string fixPathCnc = rispOffOrd.CncPath.ToLower().Replace(nestBasePath, servBasePath).Replace('/', '\\'); // segno offline order come processato registrando il disegno e segno ogni PART come lavorata da OffOrd2Item (status 992) - DataLayer.man.taOffOL.updateDrawing(Math.Abs(rispOffOrd.BatchID), fixPathDraw, fixPathCnc); + DLMan.taOffOL.updateDrawing(Math.Abs(rispOffOrd.BatchID), fixPathDraw, fixPathCnc); } } } diff --git a/NKC_WF/Controllers/BunkController.cs b/NKC_WF/Controllers/BunkController.cs index 00c51f5..72a22fd 100644 --- a/NKC_WF/Controllers/BunkController.cs +++ b/NKC_WF/Controllers/BunkController.cs @@ -8,6 +8,10 @@ namespace NKC_WF.Controllers { public class BunkController : ApiController { + /// + /// oggetto static/singleton per fare chiamate sul datalayer + /// + protected DataLayer DLMan = new DataLayer(); /// /// COdice macchina (HARD CODED) /// @@ -92,14 +96,14 @@ namespace NKC_WF.Controllers { foreach (var item in currBunk.SheetList) { - DataLayer.man.taSHL.updateDate(item.SheetId, item.Printing.DtStart, item.Printing.DtEnd, item.Machining.DtStart, item.Machining.DtEnd, item.Unloading.DtStart, item.Unloading.DtEnd, (int)item.Status); + DLMan.taSHL.updateDate(item.SheetId, item.Printing.DtStart, item.Printing.DtEnd, item.Machining.DtStart, item.Machining.DtEnd, item.Unloading.DtStart, item.Unloading.DtEnd, (int)item.Status); // verifico SE SIA AVVENUTO CON SUCCESSO lo step di lavorazione... if (item.Machining.Success) { // SE machining completato --> status a LAVORATO! if (item.Machining.DtEnd != null) { - DataLayer.man.taIL.updateSheetStatus(item.SheetId, 1, "PROD"); + DLMan.taIL.updateSheetStatus(item.SheetId, 1, "PROD"); } } } @@ -139,11 +143,11 @@ namespace NKC_WF.Controllers // calcolo stsatus dalle date valide... - DataLayer.man.taSHL.updateDate(item.SheetId, item.Printing.DtStart, item.Printing.DtEnd, item.Machining.DtStart, item.Machining.DtEnd, item.Unloading.DtStart, item.Unloading.DtEnd, (int)item.Status); + DLMan.taSHL.updateDate(item.SheetId, item.Printing.DtStart, item.Printing.DtEnd, item.Machining.DtStart, item.Machining.DtEnd, item.Unloading.DtStart, item.Unloading.DtEnd, (int)item.Status); // SE machining completato --> status a LAVORATO! if (item.Machining.DtEnd != null) { - DataLayer.man.taIL.updateSheetStatus(item.SheetId, 1, "PROD"); + DLMan.taIL.updateSheetStatus(item.SheetId, 1, "PROD"); } } // segnalo avanzamento su redis x pagina unload diff --git a/NKC_WF/Controllers/MaterialController.cs b/NKC_WF/Controllers/MaterialController.cs index 08a47ef..5c5b979 100644 --- a/NKC_WF/Controllers/MaterialController.cs +++ b/NKC_WF/Controllers/MaterialController.cs @@ -7,6 +7,10 @@ namespace NKC_WF.Controllers { public class MaterialController : ApiController { + /// + /// oggetto static/singleton per fare chiamate sul datalayer + /// + protected DataLayer DLMan = new DataLayer(); /// /// Restituisce ELENCO materiali /// @@ -16,7 +20,7 @@ namespace NKC_WF.Controllers public List Get() { List answ = new List(); - var table = DataLayer.man.taMat.GetData(); + var table = DLMan.taMat.GetData(); Material currMat = new Material(); foreach (var item in table) { diff --git a/NKC_WF/Controllers/PrintQueueController.cs b/NKC_WF/Controllers/PrintQueueController.cs index 4649137..a67a271 100644 --- a/NKC_WF/Controllers/PrintQueueController.cs +++ b/NKC_WF/Controllers/PrintQueueController.cs @@ -13,6 +13,11 @@ namespace NKC_WF.Controllers { public class PrintQueueController : ApiController { + /// + /// oggetto static/singleton per fare chiamate sul datalayer + /// + protected DataLayer DLMan = new DataLayer(); + #region classi gestione PJQ /// @@ -24,7 +29,7 @@ namespace NKC_WF.Controllers { int answ = 0; // resetto conteggio in redis... - DS_Report.PrintJobQueueDataTable tabPJQ = DataLayer.man.taPJQ.getWaiting(); + DS_Report.PrintJobQueueDataTable tabPJQ = DLMan.taPJQ.getWaiting(); if (tabPJQ != null) { answ = tabPJQ.Count; @@ -39,7 +44,7 @@ namespace NKC_WF.Controllers { int answ = 0; // resetto conteggio in redis... - DS_Report.PrintJobQueueDataTable tabPJQ = DataLayer.man.taPJQ.getWaiting(); + DS_Report.PrintJobQueueDataTable tabPJQ = DLMan.taPJQ.getWaiting(); if (tabPJQ != null) { var selQueue = tabPJQ.Where(x => queueSet.Contains($"|{x.prtName}|")).ToList(); @@ -68,33 +73,33 @@ namespace NKC_WF.Controllers { case reportRichiesto.binPost: int.TryParse(keyParam, out intIdx); - tab = (DataTable)DataLayer.man.taRepBin.GetData(intIdx, true, imagePath, qrCodeBaseUrl); + tab = (DataTable)DLMan.taRepBin.GetData(intIdx, true, imagePath, qrCodeBaseUrl); answ.Add(memLayer.ML.cdv("ReportDS_DocBin"), tab); break; case reportRichiesto.binPre: int.TryParse(keyParam, out intIdx); - tab = (DataTable)DataLayer.man.taRepBin.GetData(intIdx, false, imagePath, qrCodeBaseUrl); + tab = (DataTable)DLMan.taRepBin.GetData(intIdx, false, imagePath, qrCodeBaseUrl); answ.Add(memLayer.ML.cdv("ReportDS_DocBin"), tab); break; case reportRichiesto.bunkGroup: int.TryParse(keyParam, out intIdx); - tab = (DataTable)DataLayer.man.taRepBunkGroup.GetData(intIdx, qrCodeBaseUrl); + tab = (DataTable)DLMan.taRepBunkGroup.GetData(intIdx, qrCodeBaseUrl); answ.Add(memLayer.ML.cdv("ReportDS_DocBunkGroup"), tab); break; case reportRichiesto.bunkList: int.TryParse(keyParam, out intIdx); - tab = (DataTable)DataLayer.man.taRepBunkList.GetData(intIdx, qrCodeBaseUrl); + tab = (DataTable)DLMan.taRepBunkList.GetData(intIdx, qrCodeBaseUrl); answ.Add(memLayer.ML.cdv("ReportDS_DocBunkList"), tab); break; case reportRichiesto.cart: int.TryParse(keyParam, out intIdx); - tab = (DataTable)DataLayer.man.taRepCart.GetData(intIdx, qrCodeBaseUrl); + tab = (DataTable)DLMan.taRepCart.GetData(intIdx, qrCodeBaseUrl); answ.Add(memLayer.ML.cdv("ReportDS_DocCart"), tab); break; case reportRichiesto.offline: case reportRichiesto.part: int.TryParse(keyParam, out intIdx); - tab = (DataTable)DataLayer.man.taRepPart.GetData(intIdx, qrCodeBaseUrl); + tab = (DataTable)DLMan.taRepPart.GetData(intIdx, qrCodeBaseUrl); answ.Add(memLayer.ML.cdv("ReportDS_DocPart"), tab); break; default: @@ -172,7 +177,7 @@ namespace NKC_WF.Controllers answ = countWaitingDb; memLayer.ML.setRSV(ComLib.redQueueCount, answ.ToString(), memLayer.ML.CRI("cacheQueueSec")); // chiudo gli zombie (stampe non chiuse)... - DataLayer.man.taPJQ.chiudiZoombie(DateTime.Now.AddMilliseconds(-memLayer.ML.CRI("zombieMsTime"))); + DLMan.taPJQ.chiudiZoombie(DateTime.Now.AddMilliseconds(-memLayer.ML.CRI("zombieMsTime"))); } return answ; } @@ -187,7 +192,7 @@ namespace NKC_WF.Controllers { List answ = new List(); // recupero da DB... - DS_Report.PrintJobQueueDataTable tabPJQ = DataLayer.man.taPJQ.getByQueue(id); + DS_Report.PrintJobQueueDataTable tabPJQ = DLMan.taPJQ.getByQueue(id); if (tabPJQ.Count > 0) { reportData currReport = new reportData(); @@ -237,7 +242,7 @@ namespace NKC_WF.Controllers { int idxPJQ = 0; int.TryParse(printAnsw.ticketNum, out idxPJQ); - DataLayer.man.taPJQ.updateStato(idxPJQ, printAnsw.newStatus); + DLMan.taPJQ.updateStato(idxPJQ, printAnsw.newStatus); // resetto conteggio in redis... memLayer.ML.setRSV(ComLib.redQueueCount, countWaitingDb.ToString(), memLayer.ML.CRI("cacheQueueSec")); // svuoto code redis salvate.. diff --git a/NKC_WF/Controllers/PrintQueueLenController.cs b/NKC_WF/Controllers/PrintQueueLenController.cs index 3e45914..6f46fe0 100644 --- a/NKC_WF/Controllers/PrintQueueLenController.cs +++ b/NKC_WF/Controllers/PrintQueueLenController.cs @@ -13,6 +13,11 @@ namespace NKC_WF.Controllers { public class PrintQueueLenController : ApiController { + /// + /// oggetto static/singleton per fare chiamate sul datalayer + /// + protected DataLayer DLMan = new DataLayer(); + #region classi gestione PJQ /// @@ -24,7 +29,7 @@ namespace NKC_WF.Controllers { int answ = 0; // resetto conteggio in redis... - DS_Report.PrintJobQueueDataTable tabPJQ = DataLayer.man.taPJQ.getWaiting(); + DS_Report.PrintJobQueueDataTable tabPJQ = DLMan.taPJQ.getWaiting(); if (tabPJQ != null) { answ = tabPJQ.Count; @@ -39,7 +44,7 @@ namespace NKC_WF.Controllers { int answ = 0; // resetto conteggio in redis... - DS_Report.PrintJobQueueDataTable tabPJQ = DataLayer.man.taPJQ.getWaiting(); + DS_Report.PrintJobQueueDataTable tabPJQ = DLMan.taPJQ.getWaiting(); if (tabPJQ != null) { var selQueue = tabPJQ.Where(x => queueSet.Contains($"|{x.prtName}|")).ToList(); @@ -68,33 +73,33 @@ namespace NKC_WF.Controllers { case reportRichiesto.binPost: int.TryParse(keyParam, out intIdx); - tab = (DataTable)DataLayer.man.taRepBin.GetData(intIdx, true, imagePath, qrCodeBaseUrl); + tab = (DataTable)DLMan.taRepBin.GetData(intIdx, true, imagePath, qrCodeBaseUrl); answ.Add(memLayer.ML.cdv("ReportDS_DocBin"), tab); break; case reportRichiesto.binPre: int.TryParse(keyParam, out intIdx); - tab = (DataTable)DataLayer.man.taRepBin.GetData(intIdx, false, imagePath, qrCodeBaseUrl); + tab = (DataTable)DLMan.taRepBin.GetData(intIdx, false, imagePath, qrCodeBaseUrl); answ.Add(memLayer.ML.cdv("ReportDS_DocBin"), tab); break; case reportRichiesto.bunkGroup: int.TryParse(keyParam, out intIdx); - tab = (DataTable)DataLayer.man.taRepBunkGroup.GetData(intIdx, qrCodeBaseUrl); + tab = (DataTable)DLMan.taRepBunkGroup.GetData(intIdx, qrCodeBaseUrl); answ.Add(memLayer.ML.cdv("ReportDS_DocBunkGroup"), tab); break; case reportRichiesto.bunkList: int.TryParse(keyParam, out intIdx); - tab = (DataTable)DataLayer.man.taRepBunkList.GetData(intIdx, qrCodeBaseUrl); + tab = (DataTable)DLMan.taRepBunkList.GetData(intIdx, qrCodeBaseUrl); answ.Add(memLayer.ML.cdv("ReportDS_DocBunkList"), tab); break; case reportRichiesto.cart: int.TryParse(keyParam, out intIdx); - tab = (DataTable)DataLayer.man.taRepCart.GetData(intIdx, qrCodeBaseUrl); + tab = (DataTable)DLMan.taRepCart.GetData(intIdx, qrCodeBaseUrl); answ.Add(memLayer.ML.cdv("ReportDS_DocCart"), tab); break; case reportRichiesto.offline: case reportRichiesto.part: int.TryParse(keyParam, out intIdx); - tab = (DataTable)DataLayer.man.taRepPart.GetData(intIdx, qrCodeBaseUrl); + tab = (DataTable)DLMan.taRepPart.GetData(intIdx, qrCodeBaseUrl); answ.Add(memLayer.ML.cdv("ReportDS_DocPart"), tab); break; default: @@ -172,7 +177,7 @@ namespace NKC_WF.Controllers answ = countWaitingDb; memLayer.ML.setRSV(ComLib.redQueueCount, answ.ToString(), memLayer.ML.CRI("cacheQueueSec")); // chiudo gli zombie (stampe non chiuse)... - DataLayer.man.taPJQ.chiudiZoombie(DateTime.Now.AddMilliseconds(-memLayer.ML.CRI("zombieMsTime"))); + DLMan.taPJQ.chiudiZoombie(DateTime.Now.AddMilliseconds(-memLayer.ML.CRI("zombieMsTime"))); } return answ; } @@ -202,7 +207,7 @@ namespace NKC_WF.Controllers answ = countWaitingDbQueueMult(queueList); memLayer.ML.setRSV($"{ComLib.redQueueCountSet}:{queueList}", answ.ToString(), memLayer.ML.CRI("cacheQueueSec")); // chiudo gli zombie (stampe non chiuse)... - DataLayer.man.taPJQ.chiudiZoombie(DateTime.Now.AddMilliseconds(-memLayer.ML.CRI("zombieMsTime"))); + DLMan.taPJQ.chiudiZoombie(DateTime.Now.AddMilliseconds(-memLayer.ML.CRI("zombieMsTime"))); } return answ; } diff --git a/NKC_WF/Controllers/SheetController.cs b/NKC_WF/Controllers/SheetController.cs index fbe76af..851fa60 100644 --- a/NKC_WF/Controllers/SheetController.cs +++ b/NKC_WF/Controllers/SheetController.cs @@ -8,6 +8,11 @@ namespace NKC_WF.Controllers { public class SheetController : ApiController { + /// + /// oggetto static/singleton per fare chiamate sul datalayer + /// + protected DataLayer DLMan = new DataLayer(); + /// /// COdice macchina (HARD CODED) /// @@ -91,7 +96,7 @@ namespace NKC_WF.Controllers // se non nullo... if (currSheet != null) { - DataLayer.man.taSHL.updateDate(currSheet.SheetId, currSheet.Printing.DtStart, currSheet.Printing.DtEnd, currSheet.Machining.DtStart, currSheet.Machining.DtEnd, currSheet.Unloading.DtStart, currSheet.Unloading.DtEnd, (int)currSheet.Status); + DLMan.taSHL.updateDate(currSheet.SheetId, currSheet.Printing.DtStart, currSheet.Printing.DtEnd, currSheet.Machining.DtStart, currSheet.Machining.DtEnd, currSheet.Unloading.DtStart, currSheet.Unloading.DtEnd, (int)currSheet.Status); // verifico SE SIA AVVENUTO CON SUCCESSO lo step di lavorazione... if (currSheet.Machining.Success) { @@ -99,7 +104,7 @@ namespace NKC_WF.Controllers if (currSheet.Machining.DtEnd != null) { // hard coded su multiax - DataLayer.man.taIL.updateSheetStatus(currSheet.SheetId, 1, machine); + DLMan.taIL.updateSheetStatus(currSheet.SheetId, 1, machine); } } // segnalo avanzamento su redis x pagina unload @@ -108,7 +113,7 @@ namespace NKC_WF.Controllers BunkId = currSheet.BunkId; } } - var tabBunks = DataLayer.man.taSTL.getByKey(BunkId); + var tabBunks = DLMan.taSTL.getByKey(BunkId); if (tabBunks.Count > 0) { BatchId = tabBunks[0].BatchID; @@ -158,12 +163,12 @@ namespace NKC_WF.Controllers // se non nullo... if (currSheet != null) { - DataLayer.man.taSHL.updateDate(currSheet.SheetId, currSheet.Printing.DtStart, currSheet.Printing.DtEnd, currSheet.Machining.DtStart, currSheet.Machining.DtEnd, currSheet.Unloading.DtStart, currSheet.Unloading.DtEnd, (int)currSheet.Status); + DLMan.taSHL.updateDate(currSheet.SheetId, currSheet.Printing.DtStart, currSheet.Printing.DtEnd, currSheet.Machining.DtStart, currSheet.Machining.DtEnd, currSheet.Unloading.DtStart, currSheet.Unloading.DtEnd, (int)currSheet.Status); // SE machining completato --> status a LAVORATO x item! if (currSheet.Machining.DtEnd != null) { // hard coded su multiax - DataLayer.man.taIL.updateSheetStatus(currSheet.SheetId, 1, "WRK001"); + DLMan.taIL.updateSheetStatus(currSheet.SheetId, 1, "WRK001"); } // segnalo avanzamento su redis x pagina unload ComLib.advaceSheetRevByBunk(currSheet.BunkId); @@ -172,7 +177,7 @@ namespace NKC_WF.Controllers } } } - var tabBunks = DataLayer.man.taSTL.getByKey(BunkId); + var tabBunks = DLMan.taSTL.getByKey(BunkId); if (tabBunks.Count > 0) { BatchId = tabBunks[0].BatchID; diff --git a/NKC_WF/WebUserControls/cmp_KS_BinCart.ascx.cs b/NKC_WF/WebUserControls/cmp_KS_BinCart.ascx.cs index 0f6a053..fe24901 100644 --- a/NKC_WF/WebUserControls/cmp_KS_BinCart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_KS_BinCart.ascx.cs @@ -74,7 +74,7 @@ namespace NKC_WF.WebUserControls lbtAddOne.Visible = false; if (showBtns) { - var tabOKIB = DataLayer.man.taOKIB_Sum.getByKey(BinID, CartID); + var tabOKIB = DLMan.taOKIB_Sum.getByKey(BinID, CartID); if (tabOKIB.Count > 0) { numMax = tabOKIB[0].NumItems - tabOKIB[0].NumPicked; @@ -167,7 +167,7 @@ namespace NKC_WF.WebUserControls protected void lbtAddOne_Click(object sender, EventArgs e) { - DataLayer.man.taPLog.acquirePaint(BinID, CartID, 1, currIpAddress, user_std.UtSn.userNameAD); + DLMan.taPLog.acquirePaint(BinID, CartID, 1, currIpAddress, user_std.UtSn.userNameAD); lgInfo($"cmp_KS_BinCart | taPLog.acquirePaint | BinID : {BinID} | CartID: {CartID} | num: 1 | user: {user_std.UtSn.userNameAD} | IP: {currIpAddress}"); // resetto CartID = 0; @@ -178,7 +178,7 @@ namespace NKC_WF.WebUserControls protected void lbtAddAll_Click(object sender, EventArgs e) { - DataLayer.man.taPLog.acquirePaint(BinID, CartID, numMax, currIpAddress, user_std.UtSn.userNameAD); + DLMan.taPLog.acquirePaint(BinID, CartID, numMax, currIpAddress, user_std.UtSn.userNameAD); lgInfo($"cmp_KS_BinCart | taPLog.acquirePaint | BinID : {BinID} | CartID: {CartID} | num: {numMax} | user: {user_std.UtSn.userNameAD} | IP: {currIpAddress}"); // resetto CartID = 0; diff --git a/NKC_WF/WebUserControls/cmp_KS_Items.ascx.cs b/NKC_WF/WebUserControls/cmp_KS_Items.ascx.cs index 5cdf10d..e090a9e 100644 --- a/NKC_WF/WebUserControls/cmp_KS_Items.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_KS_Items.ascx.cs @@ -178,7 +178,7 @@ namespace NKC_WF.WebUserControls if (showBtns) { // verifico SE item e cart corrispondono x mostrare button - var tabCarts = DataLayer.man.taCR.getByItemID(ItemID); + var tabCarts = DLMan.taCR.getByItemID(ItemID); if (tabCarts != null) { if (tabCarts.Count > 0) @@ -211,7 +211,7 @@ namespace NKC_WF.WebUserControls protected void lbtAddItem_Click(object sender, EventArgs e) { - DataLayer.man.taPLog.acquireItems(ItemID, CartID, currIpAddress, user_std.UtSn.userNameAD); + DLMan.taPLog.acquireItems(ItemID, CartID, currIpAddress, user_std.UtSn.userNameAD); lgInfo($"cmp_KS_Items | taPLog.acquireItems | ItemID : {ItemID} | CartID: {CartID} | user: {user_std.UtSn.userNameAD} | IP: {currIpAddress}"); // resetto CartID = 0; diff --git a/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx.cs b/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx.cs index 3b6d75c..924f4cc 100644 --- a/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx.cs @@ -72,7 +72,7 @@ namespace NKC_WF.WebUserControls lbtAddAll.Visible = false; if (showBtns) { - var tabOKOI = DataLayer.man.taOKOI_Sum.getByKey(OtherItemID, CartID); + var tabOKOI = DLMan.taOKOI_Sum.getByKey(OtherItemID, CartID); if (tabOKOI.Count > 0) { numMax = tabOKOI[0].NumItems - tabOKOI[0].NumPicked; @@ -178,7 +178,7 @@ namespace NKC_WF.WebUserControls protected void lbtAddAll_Click(object sender, EventArgs e) { - DataLayer.man.taPLog.acquireOtherItems(OtherItemID, CartID, numMax, currIpAddress, user_std.UtSn.userNameAD); + DLMan.taPLog.acquireOtherItems(OtherItemID, CartID, numMax, currIpAddress, user_std.UtSn.userNameAD); lgInfo($"cmp_KS_OtherItemsCart | taPLog.acquireOtherItems | OtherItemID : {OtherItemID} | CartID: {CartID} | numMax: {numMax} | user: {user_std.UtSn.userNameAD} | IP: {currIpAddress}"); // resetto CartID = 0; diff --git a/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs index dda3f22..4d5ebe6 100644 --- a/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs @@ -87,7 +87,7 @@ namespace NKC_WF.WebUserControls if (!Page.IsPostBack) { - currQueue = DataLayer.man.getPrinter("PC-MACHINE-UNLOAD2"); + currQueue = DLMan.getPrinter("PC-MACHINE-UNLOAD2"); } } public void doUpdate() @@ -119,7 +119,7 @@ namespace NKC_WF.WebUserControls protected void grView_SelectedIndexChanged(object sender, EventArgs e) { // invio SINGOLO record in stampa - DataLayer.man.stampaDoc(selBinId.ToString(), currQueue, tipoDocumento.docBinPre, Request.UserHostName); + DLMan.stampaDoc(selBinId.ToString(), currQueue, tipoDocumento.docBinPre, Request.UserHostName); // reset doReset(); } @@ -131,7 +131,7 @@ namespace NKC_WF.WebUserControls protected void lbtPrintAll_Click(object sender, EventArgs e) { // chiamo stored x stampare OGNI cart del BATCH - var tabBins = DataLayer.man.taBN.getByBatch(BatchId); + var tabBins = DLMan.taBN.getByBatch(BatchId); try { if (tabBins != null && tabBins.Count > 0) @@ -139,7 +139,7 @@ namespace NKC_WF.WebUserControls foreach (var item in tabBins) { // invio SINGOLO record in stampa - DataLayer.man.stampaDoc(item.BinID.ToString(), currQueue, tipoDocumento.docBinPre, Request.UserHostName); + DLMan.stampaDoc(item.BinID.ToString(), currQueue, tipoDocumento.docBinPre, Request.UserHostName); } } } diff --git a/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs index e86f8a3..3b4d479 100644 --- a/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs @@ -103,7 +103,7 @@ namespace NKC_WF.WebUserControls { if(!Page.IsPostBack) { - currQueue= DataLayer.man.getPrinter("PC-MACHINE-UNLOAD"); + currQueue= DLMan.getPrinter("PC-MACHINE-UNLOAD"); } } public void doUpdate() @@ -118,7 +118,7 @@ namespace NKC_WF.WebUserControls protected void grView_SelectedIndexChanged(object sender, EventArgs e) { // invio SINGOLO record in stampa - DataLayer.man.stampaDoc(selCartId.ToString(), currQueue, tipoDocumento.docCart, Request.UserHostName); + DLMan.stampaDoc(selCartId.ToString(), currQueue, tipoDocumento.docCart, Request.UserHostName); // reset doReset(); } @@ -130,7 +130,7 @@ namespace NKC_WF.WebUserControls protected void lbtPrintAll_Click(object sender, EventArgs e) { // chiamo stored x stampare OGNI cart del BATCH - var tabCarts = DataLayer.man.taCR.getByBatch(BatchId); + var tabCarts = DLMan.taCR.getByBatch(BatchId); try { if (tabCarts != null && tabCarts.Count > 0) @@ -138,7 +138,7 @@ namespace NKC_WF.WebUserControls foreach (var item in tabCarts) { // invio SINGOLO record in stampa - DataLayer.man.stampaDoc(item.CartID.ToString(), currQueue, tipoDocumento.docCart, Request.UserHostName); + DLMan.stampaDoc(item.CartID.ToString(), currQueue, tipoDocumento.docCart, Request.UserHostName); } } } diff --git a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs index 86d3f89..2ffc406 100644 --- a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs @@ -68,7 +68,7 @@ namespace NKC_WF.WebUserControls string baseCurr = memLayer.ML.CRS("servBasePath").ToLower(); try { - var tabSheets = DataLayer.man.taSHL.getBySheetId(SheetId); + var tabSheets = DLMan.taSHL.getBySheetId(SheetId); if (tabSheets.Count > 0) { filename = tabSheets[0].DrawFilePath.ToLower().Replace(baseOrig, baseCurr); diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs index 8585260..ef627f6 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs @@ -260,7 +260,7 @@ namespace NKC_WF.WebUserControls protected void lbtAccept_Click(object sender, EventArgs e) { // registro accettazione Nesting - DataLayer.man.taBL.acceptBatch(BatchId, DataLayer.man.CodSoggCurrUser); + DLMan.taBL.acceptBatch(BatchId, DLMan.CodSoggCurrUser); raiseEvent(); } @@ -269,7 +269,7 @@ namespace NKC_WF.WebUserControls // resetto richiesta ComLib.resetBatchReq(); // registro su DB nesting iniziato... - DataLayer.man.taBL.updateStatus(BatchId, (int)BatchStatus.Imported, "", -1); + DLMan.taBL.updateStatus(BatchId, (int)BatchStatus.Imported, "", -1); raiseEvent(); } @@ -280,7 +280,7 @@ namespace NKC_WF.WebUserControls ComLib.sendBatchReq(BatchId, "Estimation", 1); // registro su DB nesting iniziato... - DataLayer.man.taBL.updateStatus(BatchId, (int)BatchStatus.EstimationRequested, "", 0); + DLMan.taBL.updateStatus(BatchId, (int)BatchStatus.EstimationRequested, "", 0); raiseEvent(); } protected void lbtStopNesting_Click(object sender, EventArgs e) @@ -288,7 +288,7 @@ namespace NKC_WF.WebUserControls // resetto richiesta ComLib.resetBatchReq(); // registro su DB nesting iniziato... - DataLayer.man.taBL.updateStatus(BatchId, (int)BatchStatus.EstimationDone, "", -1); + DLMan.taBL.updateStatus(BatchId, (int)BatchStatus.EstimationDone, "", -1); raiseEvent(); } @@ -299,7 +299,7 @@ namespace NKC_WF.WebUserControls ComLib.sendBatchReq(BatchId, "Nesting", 2); // registro su DB nesting iniziato... - DataLayer.man.taBL.updateStatus(BatchId, (int)BatchStatus.NestRequested, "", -1); + DLMan.taBL.updateStatus(BatchId, (int)BatchStatus.NestRequested, "", -1); raiseEvent(); } diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx.cs b/NKC_WF/WebUserControls/cmp_batchList.ascx.cs index e1215ac..a5331fe 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx.cs @@ -221,7 +221,7 @@ namespace NKC_WF.WebUserControls if (!string.IsNullOrEmpty(lbt.CommandArgument)) { // eseguo richiesta reset - DataLayer.man.taBL.redoPartValid(lbt.CommandArgument); + DLMan.taBL.redoPartValid(lbt.CommandArgument); // eventualmente mando primo batch da validare... bool newValidSent = ComLib.sendFirstValidationBatch(); // refresh! diff --git a/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs b/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs index 15d11c0..af04248 100644 --- a/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs @@ -14,12 +14,12 @@ namespace NKC_WF.WebUserControls protected void lbtResetStackBuild_Click(object sender, EventArgs e) { - DataLayer.man.taSHL.resetPrepared(-9999); + DLMan.taSHL.resetPrepared(-9999); } protected void lbtResetNest_Click(object sender, EventArgs e) { - DataLayer.man.taBL.resetNesting(-9999); + DLMan.taBL.resetNesting(-9999); } protected void lbtSaveLastAnsw_Click(object sender, EventArgs e) @@ -54,7 +54,7 @@ namespace NKC_WF.WebUserControls protected void lbtResetProd_Click(object sender, EventArgs e) { - DataLayer.man.taBL.resetProdCall(); + DLMan.taBL.resetProdCall(); } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs index 6cce228..76d9c28 100644 --- a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs @@ -128,12 +128,12 @@ namespace NKC_WF.WebUserControls try { // chiamo procedura SQL x import BATCH... come test o reale secondo del parametro - var tabCount = DataLayer.man.taCount.getNextNum("NumTicket"); + var tabCount = DLMan.taCount.getNextNum("NumTicket"); if (tabCount.Count == 1) { numTask = tabCount[0].LastNum; } - var risultati = DataLayer.man.taImpLog.importCsvKit($"{dirImport}", fileName, batchName, ";", "\n", "2", numTask, 0, 0, testOnly); + var risultati = DLMan.taImpLog.importCsvKit($"{dirImport}", fileName, batchName, ";", "\n", "2", numTask, 0, 0, testOnly); // se ho delle righe di log processo... bool allCheck = true; foreach (var item in risultati) diff --git a/NKC_WF/WebUserControls/cmp_kitList.ascx.cs b/NKC_WF/WebUserControls/cmp_kitList.ascx.cs index eaabb9f..7be3d97 100644 --- a/NKC_WF/WebUserControls/cmp_kitList.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kitList.ascx.cs @@ -55,10 +55,10 @@ namespace NKC_WF.WebUserControls switch (task) { case "Appr": - DataLayer.man.taPL.updateStatus(packListId, 2); + DLMan.taPL.updateStatus(packListId, 2); break; case "Remove": - DataLayer.man.taPL.updateStatus(packListId, 5); + DLMan.taPL.updateStatus(packListId, 5); break; default: break; diff --git a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.cs b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.cs index ca8e05e..a428c7a 100644 --- a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.cs @@ -39,8 +39,8 @@ namespace NKC_WF.WebUserControls private void fixSchedOrd() { - numRows = DataLayer.man.taPL.getToSchedule().Count * 10; - DataLayer.man.taPL.fixSched(); + numRows = DLMan.taPL.getToSchedule().Count * 10; + DLMan.taPL.fixSched(); } @@ -74,8 +74,8 @@ namespace NKC_WF.WebUserControls { int.TryParse(lbtBtn.CommandArgument, out PackListId); // avvio il job selezionato e indico status running - DataLayer.man.taPL.updateSchedPrior(PackListId, -10); - DataLayer.man.taPL.updateStatus(PackListId, 3); + DLMan.taPL.updateSchedPrior(PackListId, -10); + DLMan.taPL.updateStatus(PackListId, 3); // fix grafico! doRefresh(); raiseEvent(); @@ -85,7 +85,7 @@ namespace NKC_WF.WebUserControls private void moveBatch(int PackListId, int step) { // aggiorno - DataLayer.man.taPL.updateSchedPrior(PackListId, step); + DLMan.taPL.updateSchedPrior(PackListId, step); doRefresh(); } @@ -133,7 +133,7 @@ namespace NKC_WF.WebUserControls if (!checkVisible(mode, currPrior)) { // (2) che running siano zero, - answ = DataLayer.man.taPL.getRunning().Count == 0; + answ = DLMan.taPL.getRunning().Count == 0; } return answ; diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs index fef5861..658c07c 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs @@ -204,7 +204,7 @@ namespace NKC_WF.WebUserControls { if (string.IsNullOrEmpty(lastCmd)) doRaiseEv = true; // processiamo barcode letto - decodedData decoData = DataLayer.man.decodeBcode(lastCmd); + decodedData decoData = DLMan.decodeBcode(lastCmd); switch (decoData.codeType) { case codeType.UNK: @@ -694,7 +694,7 @@ namespace NKC_WF.WebUserControls string cartDtmx = "-"; try { - var tabCart = DataLayer.man.taCR.getByItemID(itemRow.ItemID); + var tabCart = DLMan.taCR.getByItemID(itemRow.ItemID); if (tabCart != null && tabCart.Count > 0) { cartDtmx = tabCart[0].CartDtmx; @@ -770,14 +770,14 @@ namespace NKC_WF.WebUserControls { get { - return DataLayer.man.taBN.getByItemID(itemIdSelected); + return DLMan.taBN.getByItemID(itemIdSelected); } } protected DS_App.CartsDataTable currCartTab { get { - return DataLayer.man.taCR.getByItemID(itemIdSelected); + return DLMan.taCR.getByItemID(itemIdSelected); } } @@ -804,12 +804,12 @@ namespace NKC_WF.WebUserControls } protected void lbtResetSel_Click(object sender, EventArgs e) { - var tabSheet = DataLayer.man.taSHL.getByItemID(itemIdSelected); + var tabSheet = DLMan.taSHL.getByItemID(itemIdSelected); if (tabSheet.Count == 1) { resetShowData(); // resetto sheet selezionato... - DataLayer.man.taIL.updateSheetStatusPU(tabSheet[0].SheetID, PlaceId); + DLMan.taIL.updateSheetStatusPU(tabSheet[0].SheetID, PlaceId); lgInfo($"cmp_kittingSmart | taIL.updateSheetStatusPU | SheetID: {tabSheet[0].SheetID} | PlaceId: {PlaceId}"); resetSelection(); showItemDetail(false, null, false); diff --git a/NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs b/NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs index 0ce258b..9b8446c 100644 --- a/NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs @@ -184,7 +184,7 @@ namespace NKC_WF.WebUserControls { if (string.IsNullOrEmpty(lastCmd)) doRaiseEv = true; // processiamo barcode letto - decodedData decoData = DataLayer.man.decodeBcode(lastCmd); + decodedData decoData = DLMan.decodeBcode(lastCmd); switch (decoData.codeType) { case codeType.Item: @@ -288,9 +288,9 @@ namespace NKC_WF.WebUserControls protected void lbtPrintLabels_Click(object sender, EventArgs e) { // chiamo procedura stampa report x etichette dei pezzi lavorati offline - string printer = DataLayer.man.getPrinter("PC-MACHINE-PARTS"); + string printer = DLMan.getPrinter("PC-MACHINE-PARTS"); // mando stampa.... - bool fatto = DataLayer.man.stampaDoc(itemIdSelected.ToString(), printer, tipoDocumento.docPart, Request.UserHostName); + bool fatto = DLMan.stampaDoc(itemIdSelected.ToString(), printer, tipoDocumento.docPart, Request.UserHostName); lgInfo($"PRINT req for labelsPrint | codeInt : {itemIdSelected} | currQueue: {printer} | tipoDoc: {tipoDocumento.docPart} | user: {Request.UserHostName} | IP: {currIpAddress}"); if (fatto) @@ -399,14 +399,14 @@ namespace NKC_WF.WebUserControls { get { - return DataLayer.man.taBN.getByItemID(itemIdSelected); + return DLMan.taBN.getByItemID(itemIdSelected); } } protected DS_App.CartsDataTable currCartTab { get { - return DataLayer.man.taCR.getByItemID(itemIdSelected); + return DLMan.taCR.getByItemID(itemIdSelected); } } diff --git a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs index 52ee356..7535e9a 100644 --- a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs @@ -58,7 +58,7 @@ namespace NKC_WF.WebUserControls if (allOk) { // registro che ho creato CNC... 1! - DataLayer.man.taOffOL.updateStatus(OffOrdId, 1); + DLMan.taOffOL.updateStatus(OffOrdId, 1); } frmView.DataBind(); raiseEvent(); @@ -80,7 +80,7 @@ namespace NKC_WF.WebUserControls if (allOk) { // registro che riporto a 0! - DataLayer.man.taOffOL.updateStatus(OffOrdId, 0); + DLMan.taOffOL.updateStatus(OffOrdId, 0); } frmView.DataBind(); raiseEvent(); @@ -103,7 +103,7 @@ namespace NKC_WF.WebUserControls if (allOk) { // registro che ho stampato... 2! - DataLayer.man.taOffOL.updateStatus(OffOrdId, 2); + DLMan.taOffOL.updateStatus(OffOrdId, 2); } frmView.DataBind(); raiseEvent(); @@ -112,7 +112,7 @@ namespace NKC_WF.WebUserControls protected void lblDone_Click(object sender, EventArgs e) { // registro che ho COMPLETATO... 3! (e di conseguenza aggiorna gli items...) - DataLayer.man.taOffOL.updateStatus(OffOrdId, 3); + DLMan.taOffOL.updateStatus(OffOrdId, 3); raiseReset(); } diff --git a/NKC_WF/WebUserControls/cmp_offlineOrders.ascx.cs b/NKC_WF/WebUserControls/cmp_offlineOrders.ascx.cs index c784e36..ebea984 100644 --- a/NKC_WF/WebUserControls/cmp_offlineOrders.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_offlineOrders.ascx.cs @@ -63,7 +63,7 @@ namespace NKC_WF.WebUserControls protected void grView_SelectedIndexChanged(object sender, EventArgs e) { // controllo update... SOLO SE status è 1... - var currOrd = DataLayer.man.taOffOL.getByKey(selOrdId); + var currOrd = DLMan.taOffOL.getByKey(selOrdId); bool fatto = false; try { diff --git a/NKC_WF/WebUserControls/cmp_orderSched.ascx.cs b/NKC_WF/WebUserControls/cmp_orderSched.ascx.cs index e6ca72d..bda43d9 100644 --- a/NKC_WF/WebUserControls/cmp_orderSched.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_orderSched.ascx.cs @@ -31,8 +31,8 @@ namespace NKC_WF.WebUserControls private void fixSchedOrd() { - numRows = DataLayer.man.taBL.getSched().Count * 10; - DataLayer.man.taBL.fixSched(); + numRows = DLMan.taBL.getSched().Count * 10; + DLMan.taBL.fixSched(); } @@ -60,7 +60,7 @@ namespace NKC_WF.WebUserControls private void moveBatch(int BatchId, int step) { // aggiorno - DataLayer.man.taBL.updateSchedPrior(BatchId, step); + DLMan.taBL.updateSchedPrior(BatchId, step); // ricalcolo fixSchedOrd(); grView.SelectedIndex = -1; diff --git a/NKC_WF/WebUserControls/cmp_paintingSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_paintingSmart.ascx.cs index 1a25586..66a9bbf 100644 --- a/NKC_WF/WebUserControls/cmp_paintingSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_paintingSmart.ascx.cs @@ -81,7 +81,7 @@ namespace NKC_WF.WebUserControls // verifico il datamatrix dei BIN da pitturare if (string.IsNullOrEmpty(lastCmd)) doRaiseEv = true; // processiamo barcode letto - decodedData decoData = DataLayer.man.decodeBcode(lastCmd); + decodedData decoData = DLMan.decodeBcode(lastCmd); switch (decoData.codeType) { case codeType.Item: @@ -113,7 +113,7 @@ namespace NKC_WF.WebUserControls doRaiseEv = true; break; case codeType.Bin: - var tabBin = DataLayer.man.taBN.getByKey(decoData.codeInt); + var tabBin = DLMan.taBN.getByKey(decoData.codeInt); bool allOk = false; // se ne trovo 1 --> OK verde if (tabBin.Count == 1) @@ -173,17 +173,17 @@ namespace NKC_WF.WebUserControls private void printNewLabel(decodedData decoData) { // chiamo procedura stampa report x BIN pitturati - string printer = DataLayer.man.getPrinter("PC-MACHINE-PAINT-STATION"); - DataLayer.man.stampaDoc(decoData.codeInt.ToString(), printer, tipoDocumento.docBinPost, Request.UserHostName); + string printer = DLMan.getPrinter("PC-MACHINE-PAINT-STATION"); + DLMan.stampaDoc(decoData.codeInt.ToString(), printer, tipoDocumento.docBinPost, Request.UserHostName); lgInfo($"PRINT req for BIN | codeInt : {decoData.codeInt} | currQueue: {printer} | tipoDoc: {tipoDocumento.docBinPost} | user: {Request.UserHostName} | IP: {currIpAddress}"); } private void executePaintConfirm() { // processiamo barcode letto - decodedData decoData = DataLayer.man.decodeBcode(lastValidCmd); + decodedData decoData = DLMan.decodeBcode(lastValidCmd); // lo indico come painted (update dtPainted) - DataLayer.man.taBN.updatePainted(decoData.codeInt, DateTime.Now); + DLMan.taBN.updatePainted(decoData.codeInt, DateTime.Now); lgInfo($"cmp_paintingSmart | executePaintConfirm | codeInt: {decoData.codeInt} | raw: {decoData.rawData}"); printNewLabel(decoData); // update tabelle! diff --git a/NKC_WF/WebUserControls/cmp_scrapList.ascx.cs b/NKC_WF/WebUserControls/cmp_scrapList.ascx.cs index 2066d86..c0e9840 100644 --- a/NKC_WF/WebUserControls/cmp_scrapList.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_scrapList.ascx.cs @@ -50,7 +50,7 @@ namespace NKC_WF.WebUserControls { bool doReport = false; // creo NUOVO ordine offline... - DS_App.OfflineOrderListDataTable tabOrdini = DataLayer.man.taOffOL.insertNew(); + DS_App.OfflineOrderListDataTable tabOrdini = DLMan.taOffOL.insertNew(); int itemId = 0; // se ho la riga new in risposta... if (tabOrdini.Count == 1) @@ -70,7 +70,7 @@ namespace NKC_WF.WebUserControls // aggiungo ad ordine if (itemId > 0) { - DataLayer.man.taOO2I.insertQuery(tabOrdini[0].OrdID, itemId); + DLMan.taOO2I.insertQuery(tabOrdini[0].OrdID, itemId); doReport = true; } } diff --git a/NKC_WF/WebUserControls/cmp_secScreen.ascx.cs b/NKC_WF/WebUserControls/cmp_secScreen.ascx.cs index 8ccc0ad..ac3e5af 100644 --- a/NKC_WF/WebUserControls/cmp_secScreen.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_secScreen.ascx.cs @@ -127,7 +127,7 @@ namespace NKC_WF.WebUserControls hlPdfOpener.CssClass = "btn btn-success btn-block"; hfItemDtmx.Value = value; // cerco e salvo! - var tabItem = DataLayer.man.taIL.getBySearch(0, value, 0, 9999); + var tabItem = DLMan.taIL.getBySearch(0, value, 0, 9999); if (tabItem != null && tabItem.Count > 0) { int ItemId = tabItem[0].ItemID; diff --git a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs index 2a0688e..dc9728c 100644 --- a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs @@ -38,7 +38,7 @@ namespace NKC_WF.WebUserControls /// private void checkPrint() { - DS_App.SheetListDataTable nextTbl = DataLayer.man.taSHL.getNextByStack(StackId); + DS_App.SheetListDataTable nextTbl = DLMan.taSHL.getNextByStack(StackId); // se tab vuota --> HO FINITO, mostro stampa... divPrint.Visible = (nextTbl.Count == 0); } @@ -58,7 +58,7 @@ namespace NKC_WF.WebUserControls // verifico il datamatrix dei BIN da pitturare if (string.IsNullOrEmpty(lastCmd)) doRaiseEv = true; // processiamo barcode letto - decodedData decoData = DataLayer.man.decodeBcode(lastCmd); + decodedData decoData = DLMan.decodeBcode(lastCmd); switch (decoData.codeType) { case codeType.UNK: @@ -72,7 +72,7 @@ namespace NKC_WF.WebUserControls break; case codeType.Material: // verifico SE il materiale SIA quello dello sheet richiesto dallo stack/bunk corrente... - DS_App.SheetListDataTable nextTbl = DataLayer.man.taSHL.getNextByStack(StackId); + DS_App.SheetListDataTable nextTbl = DLMan.taSHL.getNextByStack(StackId); // se tab vuota --> HO FINITO!!!! if (nextTbl.Count == 0) { @@ -86,7 +86,7 @@ namespace NKC_WF.WebUserControls { cmp_barcode.showOutput("badge badge-success", $"{traduci("SheetRecorded")}: {decoData.description}"); // chiamo stored x indicare preparato - DataLayer.man.taSHL.setPrepared(nextTbl[0].SheetID); + DLMan.taSHL.setPrepared(nextTbl[0].SheetID); lgInfo($"cmpStackBuilding | taSHL.setPrepared | SheetID: {nextTbl[0].SheetID}"); } else @@ -146,13 +146,13 @@ namespace NKC_WF.WebUserControls protected void lbtPrint_Click(object sender, EventArgs e) { // chiamo procedura stampa report x stack - string currQueue = DataLayer.man.getPrinter("PC-MACHINE-STACK-BUILD"); + string currQueue = DLMan.getPrinter("PC-MACHINE-STACK-BUILD"); // se richeisto detail --> coda Detail... if (chkDetail.Checked) { currQueue += "Detail"; } - DataLayer.man.stampaDoc(StackId.ToString(), currQueue, tipoDocumento.docStack, Request.UserHostName); + DLMan.stampaDoc(StackId.ToString(), currQueue, tipoDocumento.docStack, Request.UserHostName); lgInfo($"PRINT req | StackId : {StackId} | currQueue: {currQueue} | tipoDoc: {tipoDocumento.docStack} | user: {Request.UserHostName} | IP: {currIpAddress}"); // aggiorno stato BATCH ComLib.updateBatchPositionByBunk(StackId); diff --git a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs index 0fdd39d..3e7cf4d 100644 --- a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs @@ -124,7 +124,7 @@ namespace NKC_WF.WebUserControls doRaiseEv = true; } // processiamo barcode letto - decodedData decoData = DataLayer.man.decodeBcode(lastCmd); + decodedData decoData = DLMan.decodeBcode(lastCmd); switch (decoData.codeType) { case codeType.Stack: @@ -132,7 +132,7 @@ namespace NKC_WF.WebUserControls DS_App.StackListDataTable tabStack = null; try { - tabStack = DataLayer.man.taSTL.getByKey(decoData.codeInt); + tabStack = DLMan.taSTL.getByKey(decoData.codeInt); } catch { } @@ -172,7 +172,7 @@ namespace NKC_WF.WebUserControls int stackId = 0; try { - var tabStacks = DataLayer.man.taSTL.getByDtmx(decoData.rawData); + var tabStacks = DLMan.taSTL.getByDtmx(decoData.rawData); if (tabStack.Count == 1) { stackId = tabStack[0].StackID; @@ -183,7 +183,7 @@ namespace NKC_WF.WebUserControls // SE HO uno stackId valido (>0)... if (stackId > 0) { - DataLayer.man.taSTL.updatePos(stackId, 5); + DLMan.taSTL.updatePos(stackId, 5); lgInfo($"cmp_stackLoading| taSTL.updatePos | POS --> 5 | stackId: {stackId}"); // controllo status del bunk nel suo insieme... @@ -222,7 +222,7 @@ namespace NKC_WF.WebUserControls { bool answ = false; // leggo i dati del bunk... - var currBunks = DataLayer.man.taSTL.getCurrByBatch(BatchIdCurr); + var currBunks = DLMan.taSTL.getCurrByBatch(BatchIdCurr); if (currBunks.Count > 0) { // verifico x ogni bunk corrente @@ -243,7 +243,7 @@ namespace NKC_WF.WebUserControls { bool answ = true; // leggo i dati del bunk... - var currBunks = DataLayer.man.taSTL.getCurrByBatch(BatchIdCurr); + var currBunks = DLMan.taSTL.getCurrByBatch(BatchIdCurr); if (currBunks.Count > 0) { // verifico x ogni bunk corrente @@ -266,7 +266,7 @@ namespace NKC_WF.WebUserControls { bool answ = false; // leggo i dati del bunk... - var currBunk = DataLayer.man.taSTL.getByKey(BunkId); + var currBunk = DLMan.taSTL.getByKey(BunkId); if (currBunk.Count == 1) { answ = currBunk[0].Position == 4; @@ -303,13 +303,13 @@ namespace NKC_WF.WebUserControls protected void lbtAdvanceProd_Click(object sender, EventArgs e) { // chiama stored x cambiare dt dei vari processi governati dal prod... - var currStack = DataLayer.man.taSTL.getCurrByBatch(BatchIdCurr); + var currStack = DLMan.taSTL.getCurrByBatch(BatchIdCurr); if (currStack != null) { if (currStack.Count > 0) { int stackIdCurr = currStack[0].StackID; - DataLayer.man.taSHL.advanceInStack(stackIdCurr); + DLMan.taSHL.advanceInStack(stackIdCurr); lgInfo($"cmp_unloadSmart | MANUAL FORCED DATA | taSHL.advanceInStack | stackIdCurr: {stackIdCurr}"); } doUpdate(); diff --git a/NKC_WF/WebUserControls/cmp_svgFull.ascx.cs b/NKC_WF/WebUserControls/cmp_svgFull.ascx.cs index 638f93a..b459335 100644 --- a/NKC_WF/WebUserControls/cmp_svgFull.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_svgFull.ascx.cs @@ -61,7 +61,7 @@ namespace NKC_WF.WebUserControls { if (SheetId > 0) { - var tabSheets = DataLayer.man.taSHL.getBySheetId(SheetId); + var tabSheets = DLMan.taSHL.getBySheetId(SheetId); if (tabSheets.Count > 0) { filename = tabSheets[0].DrawFilePath.ToLower().Replace(baseOrig, baseCurr); diff --git a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs index e426482..9bea7da 100644 --- a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs @@ -210,7 +210,7 @@ namespace NKC_WF.WebUserControls { if (string.IsNullOrEmpty(lastCmd)) doRaiseEv = true; // processiamo barcode letto - decodedData decoData = DataLayer.man.decodeBcode(lastCmd); + decodedData decoData = DLMan.decodeBcode(lastCmd); switch (decoData.codeType) { case codeType.UNK: @@ -533,11 +533,11 @@ namespace NKC_WF.WebUserControls try { // SE item esiste... - var tabItem = DataLayer.man.taIL.getBySearch(itemIdSelected, itemIdSelected.ToString(), 0, 999); + var tabItem = DLMan.taIL.getBySearch(itemIdSelected, itemIdSelected.ToString(), 0, 999); if (tabItem.Count == 1) { // riposto item a status 1... - DataLayer.man.taIL.updateStatus(itemIdSelected, 1, PlaceId); + DLMan.taIL.updateStatus(itemIdSelected, 1, PlaceId); lgDebug($"cmp_unloadSmart | resetSelection | Status --> 1 | itemIdSelected: {itemIdSelected} | PlaceId: {PlaceId}"); } } @@ -580,7 +580,7 @@ namespace NKC_WF.WebUserControls if (string.IsNullOrEmpty(rawVal)) { // se non trovo --> DB - answ = DataLayer.man.taBN.getByItemID(itemIdSelected); + answ = DLMan.taBN.getByItemID(itemIdSelected); string rawData = JsonConvert.SerializeObject(answ); //salvo in redis... TTL 2 sec memLayer.ML.setRSV(redKey, rawData, 2); @@ -603,7 +603,7 @@ namespace NKC_WF.WebUserControls if (string.IsNullOrEmpty(rawVal)) { // se non trovo --> DB - answ = DataLayer.man.taCR.getByItemID(itemIdSelected); + answ = DLMan.taCR.getByItemID(itemIdSelected); string rawData = JsonConvert.SerializeObject(answ); //salvo in redis... TTL 2 sec memLayer.ML.setRSV(redKey, rawData, 2); @@ -674,19 +674,19 @@ namespace NKC_WF.WebUserControls protected void lbtCancel_Click(object sender, EventArgs e) { // resetto item selezionato... - DataLayer.man.taIL.updateStatus(itemIdSelected, 1, PlaceId); + DLMan.taIL.updateStatus(itemIdSelected, 1, PlaceId); lgInfo($"cmp_unloadSmart | cancelSelect | Status --> 1 | itemIdSelected: {itemIdSelected} | PlaceId: {PlaceId}"); resetSelection(true); showItemDetail(false, null, false); } protected void lbtResetSel_Click(object sender, EventArgs e) { - var tabSheet = DataLayer.man.taSHL.getByItemID(itemIdSelected); + var tabSheet = DLMan.taSHL.getByItemID(itemIdSelected); if (tabSheet.Count == 1) { resetShowData(); // resetto sheet selezionato... - DataLayer.man.taIL.updateSheetStatusPU(tabSheet[0].SheetID, PlaceId); + DLMan.taIL.updateSheetStatusPU(tabSheet[0].SheetID, PlaceId); lgInfo($"cmp_unloadSmart | updateSheetStatusPU | SheetID: {tabSheet[0].SheetID} | PlaceId: {PlaceId}"); resetSelection(true); showItemDetail(false, null, false); @@ -700,7 +700,7 @@ namespace NKC_WF.WebUserControls protected void lbtParkArea_Click(object sender, EventArgs e) { // resetto item selezionato... - DataLayer.man.taIL.updateStatus(itemIdSelected, 100, PlaceId); + DLMan.taIL.updateStatus(itemIdSelected, 100, PlaceId); lgInfo($"cmp_unloadSmart | parkArea | Status --> 100 | itemIdSelected: {itemIdSelected} | PlaceId: {PlaceId}"); resetSelection(true); showItemDetail(false, null, false); @@ -714,7 +714,7 @@ namespace NKC_WF.WebUserControls protected void lbtScrapped_Click(object sender, EventArgs e) { // resetto item selezionato... - DataLayer.man.taIL.updateStatus(itemIdSelected, 990, PlaceId); + DLMan.taIL.updateStatus(itemIdSelected, 990, PlaceId); lgInfo($"cmp_unloadSmart | SCRAP | Status --> 990 | itemIdSelected: {itemIdSelected} | PlaceId: {PlaceId}"); resetSelection(false); showItemDetail(false, null, false); diff --git a/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs b/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs index b5f14fe..15d7107 100644 --- a/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs @@ -20,9 +20,9 @@ namespace NKC_WF.WebUserControls private void fixVisibility() { // controllo SE HO nuove PARTS da validare... - var tabItems2Valid = DataLayer.man.taIL.getNeedValid(); - var tabItemsUnValid = DataLayer.man.taIL.getUnValid(); - var tabItems2ReValid = DataLayer.man.taIL.getNeedRevalid(); + var tabItems2Valid = DLMan.taIL.getNeedValid(); + var tabItemsUnValid = DLMan.taIL.getUnValid(); + var tabItems2ReValid = DLMan.taIL.getNeedRevalid(); lbtValidateMissing.Visible = tabItems2Valid.Count > 0; lbtRevalidate.Visible = tabItemsUnValid.Count > 0; lbtReValidAll.Visible = tabItems2ReValid.Count > 0; @@ -34,7 +34,7 @@ namespace NKC_WF.WebUserControls try { string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}{memLayer.ML.CRS("drawingFolder")}/"; - DataLayer.man.taBL.createPartValBatch(cadBasePath); + DLMan.taBL.createPartValBatch(cadBasePath); // eventualmente mando primo batch da validare... bool newValidSent = ComLib.sendFirstValidationBatch(); } @@ -49,7 +49,7 @@ namespace NKC_WF.WebUserControls // rimetto da validare tramite stored try { - DataLayer.man.taBL.resetPartUnValid(); + DLMan.taBL.resetPartUnValid(); // eventualmente mando primo batch da validare... bool newValidSent = ComLib.sendFirstValidationBatch(); } @@ -90,7 +90,7 @@ namespace NKC_WF.WebUserControls // rimetto da validare tramite stored try { - DataLayer.man.taBL.redoPartValid("*"); + DLMan.taBL.redoPartValid("*"); // eventualmente mando primo batch da validare... bool newValidSent = ComLib.sendFirstValidationBatch(); } diff --git a/NKC_WF/site/BatchPreview.aspx.cs b/NKC_WF/site/BatchPreview.aspx.cs index f907766..5808616 100644 --- a/NKC_WF/site/BatchPreview.aspx.cs +++ b/NKC_WF/site/BatchPreview.aspx.cs @@ -97,7 +97,7 @@ namespace NKC_WF.site string rawData = memLayer.ML.getRSV(tabSheetKey); if (string.IsNullOrEmpty(rawData)) { - answ = DataLayer.man.taSHL.getByBatch(BatchId); + answ = DLMan.taSHL.getByBatch(BatchId); tabSheets = answ; } else diff --git a/NKC_WF/site/GlobalSearch.aspx.cs b/NKC_WF/site/GlobalSearch.aspx.cs index 4be9e43..13497be 100644 --- a/NKC_WF/site/GlobalSearch.aspx.cs +++ b/NKC_WF/site/GlobalSearch.aspx.cs @@ -72,7 +72,7 @@ namespace NKC_WF.site private bool processLastCmd(bool doShowResults) { // processiamo barcode letto - decodedData decoData = DataLayer.man.decodeBcode(lastCmd); + decodedData decoData = DLMan.decodeBcode(lastCmd); switch (decoData.codeType) { case codeType.UNK: diff --git a/NKC_WF/site/OrderManager.aspx.cs b/NKC_WF/site/OrderManager.aspx.cs index e54e0e7..264de65 100644 --- a/NKC_WF/site/OrderManager.aspx.cs +++ b/NKC_WF/site/OrderManager.aspx.cs @@ -69,7 +69,7 @@ namespace NKC_WF string dirImport = $"{_SqlImportDir}{adesso.ToString("yyyy-MM")}\\"; int batchID = 0; // recupero elenco parti validate... - DS_App.ItemListDataTable ItemValitadion = DataLayer.man.taIL.GetData(); + DS_App.ItemListDataTable ItemValitadion = DLMan.taIL.GetData(); // preporcessing file: leggo e correggo: // - sostituisco "," --> ";" come separatore // - tolgo "" e spazi da stringa @@ -114,28 +114,28 @@ namespace NKC_WF catch (Exception exc) { logger.lg.scriviLog($"{traduci("ErrOrderCsvImp01")}:{Environment.NewLine}{exc}"); - DataLayer.man.taEL.insertQuery(DateTime.Now, "Copy CSV", $"{e.BatchName}", $"{e.BatchName}.{e.FileName}", $"Exception: {exc}"); + DLMan.taEL.insertQuery(DateTime.Now, "Copy CSV", $"{e.BatchName}", $"{e.BatchName}.{e.FileName}", $"Exception: {exc}"); } // chiamo stored caricamento DS_App.ImportLogDataTable tabDati = null; try { // chiamo procedura SQL x import... - tabDati = DataLayer.man.taImpLog.importCsvOrd($"{dirImport}", e.FileName, e.BatchName, ";", "\n", "2", 0, 0, 0); + tabDati = DLMan.taImpLog.importCsvOrd($"{dirImport}", e.FileName, e.BatchName, ";", "\n", "2", 0, 0, 0); } catch (Exception exc) { logger.lg.scriviLog($"{traduci("ErrOrderCsvImp02")}:{Environment.NewLine}{exc}"); // salvo log errore... - DataLayer.man.taEL.insertQuery(DateTime.Now, "Upload CSV", $"{e.BatchName}", $"{e.BatchName}.{e.FileName}", $"Exception: {exc}"); + DLMan.taEL.insertQuery(DateTime.Now, "Upload CSV", $"{e.BatchName}", $"{e.BatchName}.{e.FileName}", $"Exception: {exc}"); dataValidated = false; } // FIX eventuali cadFilePath... - DataLayer.man.taIL.updateCadPath(cadBasePath, 0, false); + DLMan.taIL.updateCadPath(cadBasePath, 0, false); // recupero da batch la riga impostata... try { - var tabBatch = DataLayer.man.taBL.getLastByTakt(e.BatchName); + var tabBatch = DLMan.taBL.getLastByTakt(e.BatchName); if (tabBatch != null) { if (tabBatch.Count > 0) @@ -159,7 +159,7 @@ namespace NKC_WF { var newBatch = tabDati[0]; int bStatus = 7; - DataLayer.man.taBL.updateStatus(batchID, bStatus, e.BatchName, -1); + DLMan.taBL.updateStatus(batchID, bStatus, e.BatchName, -1); } catch { } @@ -177,7 +177,7 @@ namespace NKC_WF // faccio un ciclo su OGNI record Part --> cerco se mancassero dei file dxf... try { - var tabParts = DataLayer.man.taIL.getByBatch(batchID); + var tabParts = DLMan.taIL.getByBatch(batchID); if (tabParts.Count > 0) { bool fileOk = false; @@ -200,7 +200,7 @@ namespace NKC_WF fileOk = System.IO.File.Exists(localPath); if (!fileOk) { - DataLayer.man.taEL.insertQuery(DateTime.Now, "I.1", $"B.{batchID}", $"{item.ItemExtCode}.dxf", $"{traduci("ErrOrderDxfNotFound")} {localPath} | part {item.ItemExtCode} | {item.ItemDesc}"); + DLMan.taEL.insertQuery(DateTime.Now, "I.1", $"B.{batchID}", $"{item.ItemExtCode}.dxf", $"{traduci("ErrOrderDxfNotFound")} {localPath} | part {item.ItemExtCode} | {item.ItemDesc}"); allOk = false; missingDxfList.Add(item.ItemExtCode); }