From 4901505e9386cfab867efda033e72a65200fbc5c Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 23 Nov 2019 17:12:34 +0100 Subject: [PATCH] Nuova vers: fix salvataggio con deserializzazione "estesa" (max len) --- Jenkinsfile | 8 +------- MP-IO/Web.config | 2 ++ MapoDb/MtcDataModelArchive.cs | 11 +++++++++-- MapoSDK/Objects.cs | 2 -- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9e3bd71e..723f2fbd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,15 +10,9 @@ pipeline { stage('Checkout') { agent any steps { - /* build delle SteamWare libs! */ - /* build 'SteamWare/SteamWareLib' */ - /* copio le libs...*/ - // mirroring directory x SteamWare Libs - // bat "robocopy /MIR ..\\..\\SteamWare\\SteamWareLib ..\\SteamWare\\SteamWareLib || EXIT /B 0" - /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1258']) { + withEnv(['NEXT_BUILD_NUMBER=1259']) { // env.versionNumber = VersionNumber(versionNumberString : '6.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MP-IO/Web.config b/MP-IO/Web.config index 67ce31a4..b0aea158 100644 --- a/MP-IO/Web.config +++ b/MP-IO/Web.config @@ -20,6 +20,8 @@ + + diff --git a/MapoDb/MtcDataModelArchive.cs b/MapoDb/MtcDataModelArchive.cs index b4b5b13e..46b81471 100644 --- a/MapoDb/MtcDataModelArchive.cs +++ b/MapoDb/MtcDataModelArchive.cs @@ -44,9 +44,16 @@ namespace MapoDb var collMtcSetup = database.GetCollection("MtcSetup"); // compongo filtro ricerca e metodo update var filter = Builders.Filter.Eq(u => u.idxMacchina, idxMacchina); - var update = Builders.Update.Set(u => u.dataItems, dataItems); // chiamo update: cerco riga, se c'è aggiorno sennò creo - collMtcSetup.UpdateOne(filter, update); + MtcSetup newDoc = new MtcSetup() + { + idxMacchina = idxMacchina, + dataItems = dataItems + }; + // elimino se ci fosse già... + collMtcSetup.DeleteMany(filter); + // inserisco ex novo! + collMtcSetup.InsertOne(newDoc); answ = true; } catch diff --git a/MapoSDK/Objects.cs b/MapoSDK/Objects.cs index c2555e18..18b513bc 100644 --- a/MapoSDK/Objects.cs +++ b/MapoSDK/Objects.cs @@ -2,7 +2,6 @@ using Newtonsoft.Json.Converters; using System; using System.Collections.Generic; -using System.Xml.Serialization; namespace MapoSDK { @@ -588,7 +587,6 @@ namespace MapoSDK #endregion - #if false /// /// Classe definizione parametri singolo ordine produzione