From 837f7c5cb7dbb75e054297f950d783db771d5554 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 5 Mar 2020 19:06:17 +0100 Subject: [PATCH] fix con caratteri minuscoli x path replace PROD --- AppData/ComLib.cs | 20 ++++++++++---------- Jenkinsfile | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs index a541876..eda7489 100644 --- a/AppData/ComLib.cs +++ b/AppData/ComLib.cs @@ -1342,9 +1342,9 @@ namespace AppData DS_App.SheetListDataTable tabSheets = DataLayer.man.taSHL.getByStack(currBunk.StackID); DateTime dataStart = DateTime.Now; ProdSheet currPanel; - string nestBaseBath = memLayer.ML.CRS("nestBaseBath"); - string servBaseBath = memLayer.ML.CRS("servBaseBath"); - string prodBaseBath = memLayer.ML.CRS("prodBaseBath"); + string nestBaseBath = memLayer.ML.CRS("nestBaseBath").ToLower(); + string servBaseBath = memLayer.ML.CRS("servBaseBath").ToLower(); + string prodBaseBath = memLayer.ML.CRS("prodBaseBath").ToLower(); foreach (var item in tabSheets) { // converto i workData con check null sul campo data @@ -1352,13 +1352,13 @@ namespace AppData { DtStart = item.IsPrntStartNull() ? null : (DateTime?)item.PrntStart, DtEnd = item.IsPrntEndNull() ? null : (DateTime?)item.PrntEnd, - ProgramPath = item.PrintFilePath.Replace(nestBaseBath, prodBaseBath).Replace(servBaseBath, prodBaseBath) + ProgramPath = item.PrintFilePath.ToLower().Replace(nestBaseBath, prodBaseBath).Replace(servBaseBath, prodBaseBath) }; WorkData wdMachining = new WorkData() { DtStart = item.IsWrkStartNull() ? null : (DateTime?)item.WrkStart, DtEnd = item.IsWrkEndNull() ? null : (DateTime?)item.WrkEnd, - ProgramPath = item.CncFilePath.Replace(nestBaseBath, prodBaseBath).Replace(servBaseBath, prodBaseBath) + ProgramPath = item.CncFilePath.ToLower().Replace(nestBaseBath, prodBaseBath).Replace(servBaseBath, prodBaseBath) }; WorkData wdUnload = new WorkData() { @@ -1427,9 +1427,9 @@ namespace AppData DS_App.SheetListDataTable tabSheets = DataLayer.man.taSHL.getByStack(StackID); DateTime dataStart = DateTime.Now; ProdSheet currPanel; - string nestBaseBath = memLayer.ML.CRS("nestBaseBath"); - string servBaseBath = memLayer.ML.CRS("servBaseBath"); - string prodBaseBath = memLayer.ML.CRS("prodBaseBath"); + string nestBaseBath = memLayer.ML.CRS("nestBaseBath").ToLower(); + string servBaseBath = memLayer.ML.CRS("servBaseBath").ToLower(); + string prodBaseBath = memLayer.ML.CRS("prodBaseBath").ToLower(); foreach (var item in tabSheets) { // converto i workData @@ -1437,13 +1437,13 @@ namespace AppData { DtStart = item.IsPrntStartNull() ? null : (DateTime?)item.PrntStart, DtEnd = item.IsPrntEndNull() ? null : (DateTime?)item.PrntEnd, - ProgramPath = item.PrintFilePath.Replace(nestBaseBath, prodBaseBath).Replace(servBaseBath, prodBaseBath) + ProgramPath = item.PrintFilePath.ToLower().Replace(nestBaseBath, prodBaseBath).Replace(servBaseBath, prodBaseBath) }; WorkData wdMachining = new WorkData() { DtStart = item.IsWrkStartNull() ? null : (DateTime?)item.WrkStart, DtEnd = item.IsWrkEndNull() ? null : (DateTime?)item.WrkEnd, - ProgramPath = item.CncFilePath.Replace(nestBaseBath, prodBaseBath).Replace(servBaseBath, prodBaseBath) + ProgramPath = item.CncFilePath.ToLower().Replace(nestBaseBath, prodBaseBath).Replace(servBaseBath, prodBaseBath) }; WorkData wdUnload = new WorkData() { diff --git a/Jenkinsfile b/Jenkinsfile index c8d1428..0d88588 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=262']) { + withEnv(['NEXT_BUILD_NUMBER=263']) { // env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')