From 230dad401f2ff3fe9aaa5184122f2b1527c5e768 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 23 Sep 2020 15:43:27 +0200 Subject: [PATCH 1/2] reorder codice --- AppData/DataLayer.cs | 164 +++++++++++++++++++++++-------------------- 1 file changed, 88 insertions(+), 76 deletions(-) diff --git a/AppData/DataLayer.cs b/AppData/DataLayer.cs index 0b001a5..6b3be12 100644 --- a/AppData/DataLayer.cs +++ b/AppData/DataLayer.cs @@ -15,6 +15,10 @@ namespace AppData public DS_AppTableAdapters.CountersTableAdapter taCount; public DS_AppTableAdapters.CartsTableAdapter taCR; public DS_AppTableAdapters.ErrorsLogTableAdapter taEL; + + // reports + public DS_ReportTableAdapters.ElencoPostazioniTableAdapter taElPos; + public DS_AppTableAdapters.ItemListTableAdapter taIL; public DS_AppTableAdapters.ImportLogTableAdapter taImpLog; public DS_AppTableAdapters.ItemSearchDetailTableAdapter taISD; @@ -23,32 +27,30 @@ namespace AppData public DS_AppTableAdapters.MaterialsTableAdapter taMat; public DS_AppTableAdapters.NestingTableAdapter taNest; public DS_AppTableAdapters.OfflineOrderListTableAdapter taOffOL; - public DS_AppTableAdapters.OffOrd2ItemTableAdapter taOO2I; public DS_AppTableAdapters.OKIBTableAdapter taOKIB; public DS_AppTableAdapters.OKIB_SumTableAdapter taOKIB_Sum; public DS_AppTableAdapters.OKOITableAdapter taOKOI; public DS_AppTableAdapters.OKOI_sumTableAdapter taOKOI_Sum; public DS_AppTableAdapters.OrderListTableAdapter taOL; + public DS_AppTableAdapters.OffOrd2ItemTableAdapter taOO2I; public DS_AppTableAdapters.OtherItemTableAdapter taOtItem; + public DS_ReportTableAdapters.PrintJobQueueTableAdapter taPJQ; public DS_AppTableAdapters.PackListTableAdapter taPL; public DS_AppTableAdapters.PackCheckTableAdapter taPLC; public DS_AppTableAdapters.PackListDetTableAdapter taPLD; public DS_AppTableAdapters.PackLogTableAdapter taPLog; public DS_AppTableAdapters.PartValidParetoTableAdapter taPVP; public DS_AppTableAdapters.RemnantsTableAdapter taRem; - public DS_AppTableAdapters.StackListTableAdapter taSTL; - public DS_AppTableAdapters.SheetListTableAdapter taSHL; - // reports - public DS_ReportTableAdapters.ElencoPostazioniTableAdapter taElPos; - public DS_ReportTableAdapters.PrintJobQueueTableAdapter taPJQ; public DS_ReportTableAdapters.stp_prt_BinTableAdapter taRepBin; public DS_ReportTableAdapters.stp_prt_BunkGroupTableAdapter taRepBunkGroup; public DS_ReportTableAdapters.stp_prt_BunkListTableAdapter taRepBunkList; public DS_ReportTableAdapters.stp_prt_CartTableAdapter taRepCart; - public DS_ReportTableAdapters.stp_prt_PartTableAdapter taRepPart; - public DS_ReportTableAdapters.stp_prt_OtherPartTableAdapter taRepOtherPart; public DS_ReportTableAdapters.stp_prt_IRKTableAdapter taRepIRK; public DS_ReportTableAdapters.stp_prt_IRK_SumTableAdapter taRepIRKSum; + public DS_ReportTableAdapters.stp_prt_OtherPartTableAdapter taRepOtherPart; + public DS_ReportTableAdapters.stp_prt_PartTableAdapter taRepPart; + public DS_AppTableAdapters.SheetListTableAdapter taSHL; + public DS_AppTableAdapters.StackListTableAdapter taSTL; public DataLayer() { @@ -57,6 +59,51 @@ namespace AppData setupConnString(); } + private void initTA() + { + taBL = new DS_AppTableAdapters.BatchListTableAdapter(); + taBN = new DS_AppTableAdapters.BinsTableAdapter(); + taBNLS = new DS_AppTableAdapters.BinListTableAdapter(); + taCOK = new DS_AppTableAdapters.CartOnKitTableAdapter(); + taCount = new DS_AppTableAdapters.CountersTableAdapter(); + taCR = new DS_AppTableAdapters.CartsTableAdapter(); + taEL = new DS_AppTableAdapters.ErrorsLogTableAdapter(); + taIL = new DS_AppTableAdapters.ItemListTableAdapter(); + taImpLog = new DS_AppTableAdapters.ImportLogTableAdapter(); + taISD = new DS_AppTableAdapters.ItemSearchDetailTableAdapter(); + taIV = new DS_AppTableAdapters.ItemValidationTableAdapter(); + taKL = new DS_AppTableAdapters.KitListTableAdapter(); + taMat = new DS_AppTableAdapters.MaterialsTableAdapter(); + taNest = new DS_AppTableAdapters.NestingTableAdapter(); + taOffOL = new DS_AppTableAdapters.OfflineOrderListTableAdapter(); + taOO2I = new DS_AppTableAdapters.OffOrd2ItemTableAdapter(); + taOKIB = new DS_AppTableAdapters.OKIBTableAdapter(); + taOKIB_Sum = new DS_AppTableAdapters.OKIB_SumTableAdapter(); + taOKOI = new DS_AppTableAdapters.OKOITableAdapter(); + taOKOI_Sum = new DS_AppTableAdapters.OKOI_sumTableAdapter(); + taOL = new DS_AppTableAdapters.OrderListTableAdapter(); + taOtItem = new DS_AppTableAdapters.OtherItemTableAdapter(); + taPL = new DS_AppTableAdapters.PackListTableAdapter(); + taPLC = new DS_AppTableAdapters.PackCheckTableAdapter(); + taPLD = new DS_AppTableAdapters.PackListDetTableAdapter(); + taPLog = new DS_AppTableAdapters.PackLogTableAdapter(); + taPVP = new DS_AppTableAdapters.PartValidParetoTableAdapter(); + taRem = new DS_AppTableAdapters.RemnantsTableAdapter(); + taSTL = new DS_AppTableAdapters.StackListTableAdapter(); + taSHL = new DS_AppTableAdapters.SheetListTableAdapter(); + // reports + taElPos = new DS_ReportTableAdapters.ElencoPostazioniTableAdapter(); + taPJQ = new DS_ReportTableAdapters.PrintJobQueueTableAdapter(); + taRepBin = new DS_ReportTableAdapters.stp_prt_BinTableAdapter(); + taRepBunkGroup = new DS_ReportTableAdapters.stp_prt_BunkGroupTableAdapter(); + taRepBunkList = new DS_ReportTableAdapters.stp_prt_BunkListTableAdapter(); + taRepCart = new DS_ReportTableAdapters.stp_prt_CartTableAdapter(); + taRepPart = new DS_ReportTableAdapters.stp_prt_PartTableAdapter(); + taRepOtherPart = new DS_ReportTableAdapters.stp_prt_OtherPartTableAdapter(); + taRepIRK = new DS_ReportTableAdapters.stp_prt_IRKTableAdapter(); + taRepIRKSum = new DS_ReportTableAdapters.stp_prt_IRK_SumTableAdapter(); + } + private void setupConnString() { string connString = memLayer.ML.CRS("NKC_WFConnectionString"); @@ -102,52 +149,8 @@ namespace AppData taRepIRK.Connection.ConnectionString = connString; taRepIRKSum.Connection.ConnectionString = connString; } - private void initTA() - { - taBL = new DS_AppTableAdapters.BatchListTableAdapter(); - taBN = new DS_AppTableAdapters.BinsTableAdapter(); - taBNLS = new DS_AppTableAdapters.BinListTableAdapter(); - taCOK= new DS_AppTableAdapters.CartOnKitTableAdapter (); - taCount = new DS_AppTableAdapters.CountersTableAdapter(); - taCR = new DS_AppTableAdapters.CartsTableAdapter(); - taEL = new DS_AppTableAdapters.ErrorsLogTableAdapter(); - taIL = new DS_AppTableAdapters.ItemListTableAdapter(); - taImpLog = new DS_AppTableAdapters.ImportLogTableAdapter(); - taISD = new DS_AppTableAdapters.ItemSearchDetailTableAdapter(); - taIV = new DS_AppTableAdapters.ItemValidationTableAdapter(); - taKL = new DS_AppTableAdapters.KitListTableAdapter(); - taMat = new DS_AppTableAdapters.MaterialsTableAdapter(); - taNest = new DS_AppTableAdapters.NestingTableAdapter(); - taOffOL = new DS_AppTableAdapters.OfflineOrderListTableAdapter(); - taOO2I = new DS_AppTableAdapters.OffOrd2ItemTableAdapter(); - taOKIB = new DS_AppTableAdapters.OKIBTableAdapter(); - taOKIB_Sum = new DS_AppTableAdapters.OKIB_SumTableAdapter(); - taOKOI = new DS_AppTableAdapters.OKOITableAdapter(); - taOKOI_Sum = new DS_AppTableAdapters.OKOI_sumTableAdapter(); - taOL = new DS_AppTableAdapters.OrderListTableAdapter(); - taOtItem = new DS_AppTableAdapters.OtherItemTableAdapter(); - taPL = new DS_AppTableAdapters.PackListTableAdapter(); - taPLC = new DS_AppTableAdapters.PackCheckTableAdapter(); - taPLD = new DS_AppTableAdapters.PackListDetTableAdapter(); - taPLog = new DS_AppTableAdapters.PackLogTableAdapter(); - taPVP = new DS_AppTableAdapters.PartValidParetoTableAdapter(); - taRem = new DS_AppTableAdapters.RemnantsTableAdapter(); - taSTL = new DS_AppTableAdapters.StackListTableAdapter(); - taSHL = new DS_AppTableAdapters.SheetListTableAdapter(); - // reports - taElPos = new DS_ReportTableAdapters.ElencoPostazioniTableAdapter(); - taPJQ = new DS_ReportTableAdapters.PrintJobQueueTableAdapter(); - taRepBin = new DS_ReportTableAdapters.stp_prt_BinTableAdapter(); - taRepBunkGroup = new DS_ReportTableAdapters.stp_prt_BunkGroupTableAdapter(); - taRepBunkList = new DS_ReportTableAdapters.stp_prt_BunkListTableAdapter(); - taRepCart = new DS_ReportTableAdapters.stp_prt_CartTableAdapter(); - taRepPart = new DS_ReportTableAdapters.stp_prt_PartTableAdapter(); - taRepOtherPart = new DS_ReportTableAdapters.stp_prt_OtherPartTableAdapter(); - taRepIRK = new DS_ReportTableAdapters.stp_prt_IRKTableAdapter(); - taRepIRKSum = new DS_ReportTableAdapters.stp_prt_IRK_SumTableAdapter(); - } - #endregion + #endregion oggetti public public string CodSoggCurrUser { @@ -156,6 +159,7 @@ namespace AppData return "O000123456"; } } + public string CognNomeCurrUser { get @@ -163,6 +167,7 @@ namespace AppData return "Mario Rossi"; } } + /// /// Main BCode decoding function /// @@ -256,6 +261,28 @@ namespace AppData return answ; } + /// + /// Recupera printer dato codPostazione + /// + /// + /// + public string getPrinter(string codPost) + { + string printer = ""; + // recupero da DB... + try + { + DataLayer DLMan = new DataLayer(); + var tabPost = DLMan.taElPos.getByKey(codPost); + if (tabPost.Count == 1) + { + printer = tabPost[0].stampante; + } + } + catch + { } + return printer; + } /// /// effettua la stampa di un documento @@ -290,6 +317,7 @@ namespace AppData } return answ; } + /// /// verifica esistenza record da tipo doc + chiave... /// @@ -308,6 +336,7 @@ namespace AppData var tabBinPre = taBN.getByKey(intIdx); answ = tabBinPre.Count > 0; break; + case tipoDocumento.docCart: case tipoDocumento.docCartIRK: case tipoDocumento.docCartIRKSum: @@ -315,49 +344,32 @@ namespace AppData var tabCarts = taCR.getByKey(intIdx); answ = tabCarts.Count > 0; break; + case tipoDocumento.docPart: int.TryParse(keyParam, out intIdx); var tabPart = taIL.getByKey(intIdx); answ = tabPart.Count > 0; break; + case tipoDocumento.docOtherPart: int.TryParse(keyParam, out intIdx); var tabOtherPart = taOtItem.getByKey(intIdx); answ = tabOtherPart.Count > 0; break; + case tipoDocumento.docStack: int.TryParse(keyParam, out intIdx); var tabStack = taSTL.getByKey(intIdx); answ = tabStack.Count > 0; break; + case tipoDocumento.docND: break; + default: break; } return answ; } - /// - /// Recupera printer dato codPostazione - /// - /// - /// - public string getPrinter(string codPost) - { - string printer = ""; - // recupero da DB... - try - { - DataLayer DLMan = new DataLayer(); - var tabPost = DLMan.taElPos.getByKey(codPost); - if (tabPost.Count == 1) - { - printer = tabPost[0].stampante; - } - } - catch - { } - return printer; - } } -} +} \ No newline at end of file From 88f62a7f86af24f4813bed9947749e3ec38e1b2c Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 25 Sep 2020 18:41:30 +0200 Subject: [PATCH 2/2] update secScreen x gestione pdf/PDF --- Jenkinsfile | 2 +- NKC_WF/WebUserControls/cmp_secScreen.ascx.cs | 192 ++++++++++--------- 2 files changed, 100 insertions(+), 94 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bfcbb99..f642f3f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=369']) { + withEnv(['NEXT_BUILD_NUMBER=370']) { // env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/NKC_WF/WebUserControls/cmp_secScreen.ascx.cs b/NKC_WF/WebUserControls/cmp_secScreen.ascx.cs index ac3e5af..65f6501 100644 --- a/NKC_WF/WebUserControls/cmp_secScreen.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_secScreen.ascx.cs @@ -16,61 +16,11 @@ namespace NKC_WF.WebUserControls { public partial class cmp_secScreen : BaseUserControl { - /// /// Codice macchina (HARD CODED x ora) /// protected string machine = "WRK001"; - protected void timerRefresh_Tick(object sender, EventArgs e) - { - countDown--; - if (countDown < 0) - { - refreshCodPost(); - // count-down successivi: 2 minuti - countDown = 60 * 2; - } - setCurrData(); - doUpdate(); - } - /// - /// Imposta dati correnti (Bunk / Sheet) - /// - private void setCurrData() - { - // recupero bunk corrente... - DS_App.StackListRow currBunk = ComLib.getCurrBunk(); - if (currBunk != null) - { - DS_App.SheetListRow currSheet = ComLib.getCurrSheet(currBunk.BatchID, machine); - if (currSheet != null) - { - // se variato... - if (SheetId != currSheet.SheetID) - { - SheetId = currSheet.SheetID; - } - } - } - else - { - SheetId = 0; - } - } - protected void Page_Load(object sender, EventArgs e) - { - if (!Page.IsPostBack) - { - refreshCodPost(); - doUpdate(); - // primo: 1 minuto - countDown = 60; - SheetId = 0; - itemDtmx = "IT"; - } - } - public int countDown { get @@ -84,6 +34,7 @@ namespace NKC_WF.WebUserControls hfCountDown.Value = value.ToString(); } } + public int currNum { get @@ -97,20 +48,19 @@ namespace NKC_WF.WebUserControls hfNum.Value = $"{value:000000}"; } } - public int SheetId + + public string itemCode { get { - int answ = 0; - int.TryParse(hfSheetId.Value, out answ); - return answ; + return hfItemCode.Value; } set { - hfSheetId.Value = $"{value}"; - hlShowCurrSheet.NavigateUrl = $"~/site/SvgFull?sheetId={value}"; + hfItemCode.Value = value; } } + public string itemDtmx { get @@ -133,7 +83,7 @@ namespace NKC_WF.WebUserControls int ItemId = tabItem[0].ItemID; cmp_ItemDet.ItemId = ItemId; itemCode = tabItem[0].ItemExtCode; - pdfPath = tabItem[0].PdfFilePath; + pdfPath = tabItem[0].PdfFilePath.ToLower(); } } else @@ -146,17 +96,7 @@ namespace NKC_WF.WebUserControls } } } - public string itemCode - { - get - { - return hfItemCode.Value; - } - set - { - hfItemCode.Value = value; - } - } + public string newDtmx { get @@ -166,6 +106,7 @@ namespace NKC_WF.WebUserControls return answ; } } + public string pdfPath { get @@ -175,7 +116,7 @@ namespace NKC_WF.WebUserControls set { // check preliminare: deve essere un file ".pdf..." - if (value.Trim().EndsWith(".pdf")) + if (value.ToLower().Trim().EndsWith(".pdf")) { // poiché è necessario copiare in locale il pdf... string nameOnly = $"~/temp/{itemCode}.pdf"; @@ -201,7 +142,6 @@ namespace NKC_WF.WebUserControls { value = value.Replace(listaSubst[i], listaSubst[i + 1]); } - } } try @@ -227,19 +167,18 @@ namespace NKC_WF.WebUserControls } } - private void removeOldTemp() + public int SheetId { - var fileList = fileMover.obj.elencoFilesDir(Server.MapPath("~/temp")); - foreach (var item in fileList) + get { - // solo se NON sono placeholder o none... - if (!item.Nome.Contains("none.pdf") && !item.Nome.Contains("PlaceHolder.file")) - { - if (item.dataMod < DateTime.Now.AddHours(-1)) - { - fileMover.deleteFile(Server.MapPath($"~/temp/{item.Nome}")); - } - } + int answ = 0; + int.TryParse(hfSheetId.Value, out answ); + return answ; + } + set + { + hfSheetId.Value = $"{value}"; + hlShowCurrSheet.NavigateUrl = $"~/site/SvgFull?sheetId={value}"; } } @@ -250,17 +189,6 @@ namespace NKC_WF.WebUserControls return $"SSC{currNum:000000}"; } } - /// - /// restituisce URL immagine QRCode - /// - /// - public string getImageUrl() - { - string baseUrl = $"{memLayer.ML.CRS("matrixUrl")}/HOME/QR_site/JSON?val="; - string payload = "{'baseUrl':'{0}','parameters':['" + codSSC + "']}"; - string answ = $"{baseUrl}{payload}"; - return answ; - } /// /// Aggiorna componente principale e child components @@ -277,9 +205,21 @@ namespace NKC_WF.WebUserControls } } + /// + /// restituisce URL immagine QRCode + /// + /// + public string getImageUrl() + { + string baseUrl = $"{memLayer.ML.CRS("matrixUrl")}/HOME/QR_site/JSON?val="; + string payload = "{'baseUrl':'{0}','parameters':['" + codSSC + "']}"; + string answ = $"{baseUrl}{payload}"; + return answ; + } + public void refreshCodPost() { - // se NON HO PIU' un codice valido nella richiesta redis + // se NON HO PIU' un codice valido nella richiesta redis if (string.IsNullOrEmpty(newDtmx)) { currNum = ComLib.getSecScreenCode(); @@ -289,5 +229,71 @@ namespace NKC_WF.WebUserControls imgQrMain.ImageUrl = qrUrl; } + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + refreshCodPost(); + doUpdate(); + // primo: 1 minuto + countDown = 60; + SheetId = 0; + itemDtmx = "IT"; + } + } + + protected void timerRefresh_Tick(object sender, EventArgs e) + { + countDown--; + if (countDown < 0) + { + refreshCodPost(); + // count-down successivi: 2 minuti + countDown = 60 * 2; + } + setCurrData(); + doUpdate(); + } + + private void removeOldTemp() + { + var fileList = fileMover.obj.elencoFilesDir(Server.MapPath("~/temp")); + foreach (var item in fileList) + { + // solo se NON sono placeholder o none... + if (!item.Nome.Contains("none.pdf") && !item.Nome.Contains("PlaceHolder.file")) + { + if (item.dataMod < DateTime.Now.AddHours(-1)) + { + fileMover.deleteFile(Server.MapPath($"~/temp/{item.Nome}")); + } + } + } + } + + /// + /// Imposta dati correnti (Bunk / Sheet) + /// + private void setCurrData() + { + // recupero bunk corrente... + DS_App.StackListRow currBunk = ComLib.getCurrBunk(); + if (currBunk != null) + { + DS_App.SheetListRow currSheet = ComLib.getCurrSheet(currBunk.BatchID, machine); + if (currSheet != null) + { + // se variato... + if (SheetId != currSheet.SheetID) + { + SheetId = currSheet.SheetID; + } + } + } + else + { + SheetId = 0; + } + } } } \ No newline at end of file