Merge branch 'develop'
This commit is contained in:
Vendored
+1
-1
@@ -17,7 +17,7 @@ pipeline {
|
||||
|
||||
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
|
||||
script {
|
||||
withEnv(['NEXT_BUILD_NUMBER=133']) {
|
||||
withEnv(['NEXT_BUILD_NUMBER=134']) {
|
||||
// env.versionNumber = VersionNumber(versionNumberString : '0.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
|
||||
env.versionNumber = VersionNumber(versionNumberString : '0.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
|
||||
env.APP_NAME = 'NKC'
|
||||
|
||||
@@ -264,6 +264,10 @@ namespace NKC_SDK
|
||||
/// Tempo STIMATO di taglio calcolato dal Nesting espresso in Secondi
|
||||
/// </summary>
|
||||
public double EstimatedWorktime { get; set; } = 0;
|
||||
/// <summary>
|
||||
/// Elenco errori riscontrati
|
||||
/// </summary>
|
||||
public List<ErrorRep> ErrorsList { get; set; } = null;
|
||||
}
|
||||
/// <summary>
|
||||
/// Risposta NESTING x la STIMA iniziale
|
||||
@@ -355,6 +359,29 @@ namespace NKC_SDK
|
||||
/// </summary>
|
||||
public List<NestSheet> SheetList { get; set; }
|
||||
}
|
||||
/// <summary>
|
||||
/// Oggetto errore da poter rispondere con chiamate x stima/nesting
|
||||
/// </summary>
|
||||
public class ErrorRep
|
||||
{
|
||||
/// <summary>
|
||||
/// DataOra registrazione record
|
||||
/// </summary>
|
||||
public DateTime DtRif { get; set; } = DateTime.Now;
|
||||
/// <summary>
|
||||
/// Tipo di errore
|
||||
/// </summary>
|
||||
public string ErrType { get; set; } = "NA";
|
||||
/// <summary>
|
||||
/// Chiave univoca per l'errore
|
||||
/// es: BatchId.OrderId.Row.PartId...
|
||||
/// </summary>
|
||||
public string Uid { get; set; } = "A.B.C.D";
|
||||
/// <summary>
|
||||
/// Descrizione estesa (human readable) dell'errore
|
||||
/// </summary>
|
||||
public string Description { get; set; } = "";
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
+1
-1
@@ -58,7 +58,7 @@
|
||||
<add key="_SqlCopyDir" value="\\sql2016dev\Share\NKC\"/>
|
||||
<add key="_SqlImportDir" value="c:\Share\NKC\"/>
|
||||
<!--Area file x scambio CAD / NESTING-->
|
||||
<add key="cadBaseBath" value="c:\temp\FileSauder\DXF\"/>
|
||||
<add key="cadBaseBath" value="C:\Users\Dell\Dropbox\SVG\DXF\"/>
|
||||
<add key="svgBasePath" value="\\stor01\DropboxSteamware\"/>
|
||||
<!--Configurazioni Redis-->
|
||||
<!--<add key="RedisConn" value="localhost,abortConnect=false,ssl=false"/>
|
||||
|
||||
Reference in New Issue
Block a user