Egalware/NKC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into SDK

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-03-11 11:05:05 +01:00
parent 6eebe96f1e 0dc9e40b5e
commit 08060caaa1
4 changed files with 5 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=264']) {
withEnv(['NEXT_BUILD_NUMBER=265']) {
// 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}')
NKC_WF/Controllers/BatchProcController.cs
+1 -23
View File
@@ -209,7 +209,7 @@ namespace NKC_WF.Controllers
// 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")}";
string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}{memLayer.ML.CRS("drawingFolder")}/";
DataLayer.man.taIL.updateCadPath(cadBasePath, rispStima.BatchID, false);
// verifico IN CASO di validazione andata a buon fine --> valorizzo tabella!
if (bStatus > 7)
@@ -305,27 +305,5 @@ namespace NKC_WF.Controllers
// restituisco risposta
return answ;
}
#if false
// POST: api/BatchProc
public void Post([FromBody]string value)
{
}
// PUT: api/BatchProc/5
public void Put(int id, [FromBody]string value)
{
}
// DELETE: api/BatchProc/5
public void Delete(int id)
{
}
#endif
}
}
NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs
+1 -1
View File
@@ -33,7 +33,7 @@ namespace NKC_WF.WebUserControls
// chiamo stored x creazione NUOVI BATCH...
try
{
string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}/{memLayer.ML.CRS("drawingFolder")}";
string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}{memLayer.ML.CRS("drawingFolder")}/";
DataLayer.man.taBL.createPartValBatch(cadBasePath);
// eventualmente mando primo batch da validare...
bool newValidSent = ComLib.sendFirstValidationBatch();
NKC_WF/site/OrderManager.aspx.cs
+2 -2
View File
@@ -19,11 +19,11 @@ namespace NKC_WF
/// <summary>
/// Path base x nesting
/// </summary>
protected string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}/{memLayer.ML.CRS("drawingFolder")}";
protected string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}{memLayer.ML.CRS("drawingFolder")}/";
/// <summary>
/// Path base x server
/// </summary>
protected string srvCadBasePath = $"{memLayer.ML.CRS("servBasePath")}/{memLayer.ML.CRS("drawingFolder")}";
protected string srvCadBasePath = $"{memLayer.ML.CRS("servBasePath")}{memLayer.ML.CRS("drawingFolder")}/";
protected void Page_Load(object sender, EventArgs e)
{