diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs
index cc465a3..a541876 100644
--- a/AppData/ComLib.cs
+++ b/AppData/ComLib.cs
@@ -1342,6 +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");
foreach (var item in tabSheets)
{
// converto i workData con check null sul campo data
@@ -1349,13 +1352,13 @@ namespace AppData
{
DtStart = item.IsPrntStartNull() ? null : (DateTime?)item.PrntStart,
DtEnd = item.IsPrntEndNull() ? null : (DateTime?)item.PrntEnd,
- ProgramPath = item.PrintFilePath
+ ProgramPath = item.PrintFilePath.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
+ ProgramPath = item.CncFilePath.Replace(nestBaseBath, prodBaseBath).Replace(servBaseBath, prodBaseBath)
};
WorkData wdUnload = new WorkData()
{
@@ -1424,6 +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");
foreach (var item in tabSheets)
{
// converto i workData
@@ -1431,13 +1437,13 @@ namespace AppData
{
DtStart = item.IsPrntStartNull() ? null : (DateTime?)item.PrntStart,
DtEnd = item.IsPrntEndNull() ? null : (DateTime?)item.PrntEnd,
- ProgramPath = item.PrintFilePath
+ ProgramPath = item.PrintFilePath.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
+ ProgramPath = item.CncFilePath.Replace(nestBaseBath, prodBaseBath).Replace(servBaseBath, prodBaseBath)
};
WorkData wdUnload = new WorkData()
{
diff --git a/Jenkinsfile b/Jenkinsfile
index e088b47..c8d1428 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=261']) {
+ withEnv(['NEXT_BUILD_NUMBER=262']) {
// 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}')
diff --git a/NKC_WF/Controllers/BatchProcController.cs b/NKC_WF/Controllers/BatchProcController.cs
index 5539821..9d4f42b 100644
--- a/NKC_WF/Controllers/BatchProcController.cs
+++ b/NKC_WF/Controllers/BatchProcController.cs
@@ -209,7 +209,8 @@ namespace NKC_WF.Controllers
// salvo udpate elenco ITEMS
ComLib.updatePartsFromNesting(rispStima.PartList);
// aggiorno cadPath x items che non abbiano valorizzato...
- DataLayer.man.taIL.updateCadPath(memLayer.ML.CRS("cadBaseBath"), rispStima.BatchID, false);
+ string cadBaseBath = $"{memLayer.ML.CRS("nestBaseBath")}/DXF";
+ DataLayer.man.taIL.updateCadPath(cadBaseBath, rispStima.BatchID, false);
// verifico IN CASO di validazione andata a buon fine --> valorizzo tabella!
if (bStatus > 7)
{
diff --git a/NKC_WF/Controllers/BunkController.cs b/NKC_WF/Controllers/BunkController.cs
index 009a1c4..2c52184 100644
--- a/NKC_WF/Controllers/BunkController.cs
+++ b/NKC_WF/Controllers/BunkController.cs
@@ -152,18 +152,5 @@ namespace NKC_WF.Controllers
return answ;
}
-#if false
- // POST: api/Bunk
- [HttpPost]
- public void Post([FromBody]string value)
- {
- }
-
- // DELETE: api/Bunk/5
- [HttpDelete]
- public void Delete(int id)
- {
- }
-#endif
}
}
diff --git a/NKC_WF/Web.Debug-LELE.config b/NKC_WF/Web.Debug-LELE.config
index a7ba594..f81b060 100644
--- a/NKC_WF/Web.Debug-LELE.config
+++ b/NKC_WF/Web.Debug-LELE.config
@@ -7,9 +7,6 @@
-
-
-
diff --git a/NKC_WF/Web.Debug.config b/NKC_WF/Web.Debug.config
index b55ff49..8531823 100644
--- a/NKC_WF/Web.Debug.config
+++ b/NKC_WF/Web.Debug.config
@@ -8,9 +8,6 @@
-
-
-
diff --git a/NKC_WF/Web.Prod.config b/NKC_WF/Web.Prod.config
index e08e2d6..6a718f3 100644
--- a/NKC_WF/Web.Prod.config
+++ b/NKC_WF/Web.Prod.config
@@ -8,9 +8,6 @@
-
-
-
diff --git a/NKC_WF/Web.Release.config b/NKC_WF/Web.Release.config
index 9da4541..5e8a9ad 100644
--- a/NKC_WF/Web.Release.config
+++ b/NKC_WF/Web.Release.config
@@ -6,13 +6,8 @@
-
-
-
diff --git a/NKC_WF/Web.config b/NKC_WF/Web.config
index a074241..6f5358c 100644
--- a/NKC_WF/Web.config
+++ b/NKC_WF/Web.config
@@ -59,19 +59,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs
index 0a80eba..f04ad2d 100644
--- a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs
@@ -64,15 +64,15 @@ namespace NKC_WF.WebUserControls
{
// recupero ID del foglio corrente
string answ = "";
- string baseOrig = memLayer.ML.CRS("drawBaseBath").ToLower();
- string baseCurr = memLayer.ML.CRS("srvDrawBaseBath").ToLower();
+ string baseOrig = memLayer.ML.CRS("nestBaseBath").ToLower();
+ string baseCurr = memLayer.ML.CRS("servBaseBath").ToLower();
try
{
var tabSheets = DataLayer.man.taSHL.getBySheetId(SheetId);
if (tabSheets.Count > 0)
{
filename = tabSheets[0].DrawFilePath.ToLower().Replace(baseOrig, baseCurr);
- if(memLayer.ML.CRB("userVirtDir"))
+ if (memLayer.ML.CRB("userVirtDir"))
{
filename = Server.MapPath(filename);
}
@@ -81,7 +81,7 @@ namespace NKC_WF.WebUserControls
}
catch
{ }
- if (answ == "")
+ if (string.IsNullOrEmpty(answ))
{
// loggo...
logger.lg.scriviLog($"SVG not found | filename: {filename} | baseOrig: {baseOrig} | baseCurr: {baseCurr} | used default SVG");
@@ -94,7 +94,7 @@ namespace NKC_WF.WebUserControls
}
protected void Page_Load(object sender, EventArgs e)
{
- if(!Page.IsPostBack)
+ if (!Page.IsPostBack)
{
// scrivo valore revisione batch!
hfCurrBunkRev.Value = ComLib.getSheetRevByBunk(BatchId).ToString();
diff --git a/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs b/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs
index ff67d3f..0b96046 100644
--- a/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs
@@ -33,7 +33,8 @@ namespace NKC_WF.WebUserControls
// chiamo stored x creazione NUOVI BATCH...
try
{
- DataLayer.man.taBL.createPartValBatch(memLayer.ML.CRS("cadBaseBath"));
+ string cadBaseBath = $"{memLayer.ML.CRS("nestBaseBath")}/DXF";
+ DataLayer.man.taBL.createPartValBatch(cadBaseBath);
// eventualmente mando primo batch da validare...
bool newValidSent = ComLib.sendFirstValidationBatch();
}
diff --git a/NKC_WF/export/BunkDetail.aspx.cs b/NKC_WF/export/BunkDetail.aspx.cs
index 55087f6..ada6aaf 100644
--- a/NKC_WF/export/BunkDetail.aspx.cs
+++ b/NKC_WF/export/BunkDetail.aspx.cs
@@ -69,17 +69,5 @@ namespace NKC_WF.export
answ = $"00:{numMin:00}:{numSec:00}";
return answ;
}
- ///
- /// Restitusice path bnonificato
- ///
- ///
- ///
- public string fixFilePath(object _rawPath)
- {
- string answ = _rawPath.ToString().ToLower();
- string fileBasePath = memLayer.ML.CRS("fileBasePath").ToLower();
- answ = answ.Replace(fileBasePath, "").Replace("svg", "SVG").Replace("cnc", "CNC");
- return answ;
- }
}
}
\ No newline at end of file
diff --git a/NKC_WF/site/OrderManager.aspx.cs b/NKC_WF/site/OrderManager.aspx.cs
index a82e92b..22374ca 100644
--- a/NKC_WF/site/OrderManager.aspx.cs
+++ b/NKC_WF/site/OrderManager.aspx.cs
@@ -19,11 +19,11 @@ namespace NKC_WF
///
/// Path base x nesting
///
- protected string cadBaseBath = memLayer.ML.CRS("cadBaseBath");
+ protected string cadBaseBath = $"{memLayer.ML.CRS("nestBaseBath")}/DXF";
///
/// Path base x server
///
- protected string srvCadBaseBath = memLayer.ML.CRS("srvCadBaseBath");
+ protected string srvCadBaseBath = $"{memLayer.ML.CRS("servBaseBath")}/DXF";
protected void Page_Load(object sender, EventArgs e)
{
@@ -130,7 +130,7 @@ namespace NKC_WF
dataValidated = false;
}
// FIX eventuali cadFilePath...
- DataLayer.man.taIL.updateCadPath(memLayer.ML.CRS("cadBaseBath"), 0, false);
+ DataLayer.man.taIL.updateCadPath(cadBaseBath, 0, false);
// recupero da batch la riga impostata...
try
{