diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index 86c0af44..f444bef0 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
net8.0
enable
- 8.16.2606.817
+ 8.16.2606.915
enable
MP_TAB3
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index bd04046d..df7cfb29 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOSPEC
- Versione: 8.16.2606.817
+ Versione: 8.16.2606.915
Note di rilascio:
-
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index 6f0f7fc4..dec9978c 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-8.16.2606.817
+8.16.2606.915
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index c6396b31..f0a6ec40 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 8.16.2606.817
+ 8.16.2606.915
https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip
https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html
false
diff --git a/MP.Data/Controllers/MpIocController.cs b/MP.Data/Controllers/MpIocController.cs
index 6502ccf6..907fdb53 100644
--- a/MP.Data/Controllers/MpIocController.cs
+++ b/MP.Data/Controllers/MpIocController.cs
@@ -24,21 +24,8 @@ namespace MP.Data.Controllers
IDbContextFactory ctxFactory,
IDbContextFactory ctxFactoryFL)
{
-#if false
- _configuration = configuration;
-#endif
_ctxFactory = ctxFactory;
_ctxFactoryFL = ctxFactoryFL;
-#if false
- string connStr = configuration.GetConnectionString("MP.Data");
- options = new DbContextOptionsBuilder()
- .UseSqlServer(connStr)
- .Options;
- string connStrFlux = configuration.GetConnectionString("MP.Flux");
- optionsFlux = new DbContextOptionsBuilder()
- .UseSqlServer(connStrFlux)
- .Options;
-#endif
Log.Info("Avviata classe MpIocController");
}
@@ -500,9 +487,6 @@ namespace MP.Data.Controllers
// Update() allega l'entità e segna tutti i campi come Modified
dbCtx.DbSetMicroStatoMacc.Update(actRec);
-#if false
- dbCtx.Entry(actRec).State = EntityState.Modified;
-#endif
}
// ora record EVList
@@ -540,6 +524,7 @@ namespace MP.Data.Controllers
.ToListAsync();
}
+#if false
///
/// Elenco ultimi n record flux log dato macchina e flusso (ordinato x data registrazione)
///
@@ -560,7 +545,8 @@ namespace MP.Data.Controllers
.OrderByDescending(x => x.dtEvento)
.Take(MaxRec)
.ToListAsync();
- }
+ }
+#endif
///
/// Aggiunta record FluxLog
@@ -574,7 +560,7 @@ namespace MP.Data.Controllers
var currRec = dbCtx
.DbSetFluxLog
.Add(newRec);
- return await dbCtx.SaveChangesAsync()>0;
+ return await dbCtx.SaveChangesAsync() > 0;
}
@@ -597,6 +583,7 @@ namespace MP.Data.Controllers
return result > 0;
}
+#if false
///
/// Upsert record keepalive
///
@@ -635,7 +622,7 @@ namespace MP.Data.Controllers
fatto = await dbCtx.SaveChangesAsync() > 0;
return fatto;
- }
+ }
public async Task> ListLinkFiltAsync(string tipoLink)
{
@@ -856,6 +843,7 @@ namespace MP.Data.Controllers
return dbResult;
}
+#endif
///
/// Generazione automatica ODL
@@ -929,6 +917,7 @@ namespace MP.Data.Controllers
return answ;
}
+#if false
///
/// Fix ODL per macchine SLAVE
///
@@ -949,7 +938,32 @@ namespace MP.Data.Controllers
.ExecuteSqlRawAsync("EXEC stp_ODL_fixMachineSlave @IdxMacchina, @NumDayPrev, @DoInsert", idxMaccParam, numDayPrevParam, doInsertParam);
return result != -1;
+ }
+
+ ///
+ /// Elenco ODL data macchina e periodo
+ ///
+ ///
+ ///
+ ///
+ ///
+ public async Task> OdlListByMaccPeriodoAsync(string idxMacchina, DateTime dtStart, DateTime dtEnd)
+ {
+ List dbResult = new List();
+ using var dbCtx = _ctxFactory.CreateDbContext();
+
+ var IdxMacchina = new SqlParameter("@IdxMacchina", idxMacchina);
+ var DataFrom = new SqlParameter("@dataFrom", dtStart);
+ var DataTo = new SqlParameter("@dataTo", dtEnd);
+ dbResult = await dbCtx
+ .DbSetODLExp
+ .FromSqlRaw("EXEC stp_ODL_getByMacchinaPeriodo @IdxMacchina, @dataFrom, @dataTo", IdxMacchina, DataFrom, DataTo)
+ .AsNoTracking()
+ .ToListAsync();
+
+ return dbResult;
}
+#endif
///
/// Fix ODL per macchine SLAVE Async
@@ -993,29 +1007,6 @@ namespace MP.Data.Controllers
return answ;
}
- ///
- /// Elenco ODL data macchina e periodo
- ///
- ///
- ///
- ///
- ///
- public async Task> OdlListByMaccPeriodoAsync(string idxMacchina, DateTime dtStart, DateTime dtEnd)
- {
- List dbResult = new List();
- using var dbCtx = _ctxFactory.CreateDbContext();
-
- var IdxMacchina = new SqlParameter("@IdxMacchina", idxMacchina);
- var DataFrom = new SqlParameter("@dataFrom", dtStart);
- var DataTo = new SqlParameter("@dataTo", dtEnd);
- dbResult = await dbCtx
- .DbSetODLExp
- .FromSqlRaw("EXEC stp_ODL_getByMacchinaPeriodo @IdxMacchina, @dataFrom, @dataTo", IdxMacchina, DataFrom, DataTo)
- .AsNoTracking()
- .ToListAsync();
-
- return dbResult;
- }
///
/// Conteggio PzProd Macchina Async
@@ -1131,27 +1122,6 @@ namespace MP.Data.Controllers
return result != 0;
}
- ///
- /// Update record Registro Dichiarazioni
- ///
- ///
- ///
- public async Task RegDichiarUpdateAsync(RegistroDichiarazioniModel newRec)
- {
- using var dbCtx = _ctxFactory.CreateDbContext();
-
- var Original_IdxDich = new SqlParameter("@Original_IdxDich", newRec.IdxDich);
- var DtRec = new SqlParameter("@DtRec", newRec.DtRec);
- var TagCode = new SqlParameter("@TagCode", newRec.TagCode);
- var ValString = new SqlParameter("@ValString", newRec.ValString);
- var MatrOpr = new SqlParameter("@MatrOpr", newRec.MatrOpr);
- var result = await dbCtx
- .Database
- .ExecuteSqlRawAsync("exec dbo.stp_DD_updateQuery @Original_IdxDich, @DtRec, @TagCode, @ValString, @MatrOpr", Original_IdxDich, DtRec, TagCode, ValString, MatrOpr);
-
- return result != 0;
- }
-
///
/// Aggiunta record RegistroScarti
///
@@ -1222,6 +1192,28 @@ namespace MP.Data.Controllers
return fatto;
}
+#if false
+ ///
+ /// Update record Registro Dichiarazioni
+ ///
+ ///
+ ///
+ public async Task RegDichiarUpdateAsync(RegistroDichiarazioniModel newRec)
+ {
+ using var dbCtx = _ctxFactory.CreateDbContext();
+
+ var Original_IdxDich = new SqlParameter("@Original_IdxDich", newRec.IdxDich);
+ var DtRec = new SqlParameter("@DtRec", newRec.DtRec);
+ var TagCode = new SqlParameter("@TagCode", newRec.TagCode);
+ var ValString = new SqlParameter("@ValString", newRec.ValString);
+ var MatrOpr = new SqlParameter("@MatrOpr", newRec.MatrOpr);
+ var result = await dbCtx
+ .Database
+ .ExecuteSqlRawAsync("exec dbo.stp_DD_updateQuery @Original_IdxDich, @DtRec, @TagCode, @ValString, @MatrOpr", Original_IdxDich, DtRec, TagCode, ValString, MatrOpr);
+
+ return result != 0;
+ }
+
///
/// Aggiunta record RemoteRebootLog
///
@@ -1375,6 +1367,7 @@ namespace MP.Data.Controllers
return dbResult;
}
+#endif
///
/// Stato prod macchina (completo) Async
@@ -1458,23 +1451,9 @@ namespace MP.Data.Controllers
#endregion Public Methods
#region Private Fields
-
-#if false
- private static IConfiguration _configuration;
-#endif
private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
-#if false
- private DbContextOptions options;
-#endif
private DbContextOptions optionsFlux;
#endregion Private Fields
-
-#if false
- public void Dispose()
- {
- _configuration = null;
- }
-#endif
}
}
\ No newline at end of file
diff --git a/MP.INVE/MP.INVE.csproj b/MP.INVE/MP.INVE.csproj
index dbb5918a..fa73e22f 100644
--- a/MP.INVE/MP.INVE.csproj
+++ b/MP.INVE/MP.INVE.csproj
@@ -5,7 +5,7 @@
enable
enable
MP.INVE
- 8.16.2606.414
+ 8.16.2606.915
diff --git a/MP.INVE/Resources/ChangeLog.html b/MP.INVE/Resources/ChangeLog.html
index efb06a08..45ab1fe4 100644
--- a/MP.INVE/Resources/ChangeLog.html
+++ b/MP.INVE/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOINVE
-
Versione: 8.16.2606.414
+ Versione: 8.16.2606.915
Note di rilascio:
-
diff --git a/MP.INVE/Resources/VersNum.txt b/MP.INVE/Resources/VersNum.txt
index b698ae9b..dec9978c 100644
--- a/MP.INVE/Resources/VersNum.txt
+++ b/MP.INVE/Resources/VersNum.txt
@@ -1 +1 @@
-8.16.2606.414
+8.16.2606.915
diff --git a/MP.INVE/Resources/manifest.xml b/MP.INVE/Resources/manifest.xml
index 069a59b5..b2766bd6 100644
--- a/MP.INVE/Resources/manifest.xml
+++ b/MP.INVE/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 8.16.2606.414
+ 8.16.2606.915
https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/MP.INVE.zip
https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/ChangeLog.html
false
diff --git a/MP.IOC/MP.IOC.csproj b/MP.IOC/MP.IOC.csproj
index cb98ffff..1f0befe9 100644
--- a/MP.IOC/MP.IOC.csproj
+++ b/MP.IOC/MP.IOC.csproj
@@ -4,7 +4,7 @@
net8.0
enable
enable
- 8.16.2606.814
+ 8.16.2606.915
diff --git a/MP.IOC/Resources/ChangeLog.html b/MP.IOC/Resources/ChangeLog.html
index 15b937b4..030f4963 100644
--- a/MP.IOC/Resources/ChangeLog.html
+++ b/MP.IOC/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MP-IOC
-
Versione: 8.16.2606.814
+ Versione: 8.16.2606.915
Note di rilascio:
-
diff --git a/MP.IOC/Resources/VersNum.txt b/MP.IOC/Resources/VersNum.txt
index 52c9da08..dec9978c 100644
--- a/MP.IOC/Resources/VersNum.txt
+++ b/MP.IOC/Resources/VersNum.txt
@@ -1 +1 @@
-8.16.2606.814
+8.16.2606.915
diff --git a/MP.IOC/Resources/manifest.xml b/MP.IOC/Resources/manifest.xml
index 2df78cf9..6eb549e9 100644
--- a/MP.IOC/Resources/manifest.xml
+++ b/MP.IOC/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 8.16.2606.814
+ 8.16.2606.915
https://nexus.steamware.net/repository/SWS/MP-IOC/stable/LAST/MP.IOC.zip
https://nexus.steamware.net/repository/SWS/MP-IOC/stable/LAST/ChangeLog.html
false
diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj
index d60e617a..ef651b04 100644
--- a/MP.Land/MP.Land.csproj
+++ b/MP.Land/MP.Land.csproj
@@ -3,7 +3,7 @@
net8.0
MP.Land
- 8.16.2606.0414
+ 8.16.2606.0915
Debug;Release;Debug_LiManDebug
en
True
diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html
index b49d1e44..a9186fed 100644
--- a/MP.Land/Resources/ChangeLog.html
+++ b/MP.Land/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo Tablet MAPO - DotNet6
-
Versione: 8.16.2606.0414
+ Versione: 8.16.2606.0915
Note di rilascio:
diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt
index 4ee401ca..56a1118d 100644
--- a/MP.Land/Resources/VersNum.txt
+++ b/MP.Land/Resources/VersNum.txt
@@ -1 +1 @@
-8.16.2606.0414
+8.16.2606.0915
diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml
index 6a6066a6..962aea7f 100644
--- a/MP.Land/Resources/manifest.xml
+++ b/MP.Land/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 8.16.2606.0414
+ 8.16.2606.0915
https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip
https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html
false
diff --git a/MP.MON/MP.MON.csproj b/MP.MON/MP.MON.csproj
index c3110508..b451a9c3 100644
--- a/MP.MON/MP.MON.csproj
+++ b/MP.MON/MP.MON.csproj
@@ -6,7 +6,7 @@
enable
MP.MON
$(AssemblyName.Replace(' ', '_'))
- 8.16.2606.414
+ 8.16.2606.915
diff --git a/MP.MON/Resources/ChangeLog.html b/MP.MON/Resources/ChangeLog.html
index 988f5d0e..df7cfb29 100644
--- a/MP.MON/Resources/ChangeLog.html
+++ b/MP.MON/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOSPEC
- Versione: 8.16.2606.414
+ Versione: 8.16.2606.915
Note di rilascio:
-
diff --git a/MP.MON/Resources/VersNum.txt b/MP.MON/Resources/VersNum.txt
index b698ae9b..dec9978c 100644
--- a/MP.MON/Resources/VersNum.txt
+++ b/MP.MON/Resources/VersNum.txt
@@ -1 +1 @@
-8.16.2606.414
+8.16.2606.915
diff --git a/MP.MON/Resources/manifest.xml b/MP.MON/Resources/manifest.xml
index 0b5c0db9..fbe9b30d 100644
--- a/MP.MON/Resources/manifest.xml
+++ b/MP.MON/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 8.16.2606.414
+ 8.16.2606.915
https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP.MON.zip
https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html
false
diff --git a/MP.Prog/MP.Prog.csproj b/MP.Prog/MP.Prog.csproj
index f85259e9..061537ea 100644
--- a/MP.Prog/MP.Prog.csproj
+++ b/MP.Prog/MP.Prog.csproj
@@ -3,7 +3,7 @@
net8.0
MP.Prog
- 8.16.2606.0414
+ 8.16.2606.0915
True
diff --git a/MP.Prog/Resources/ChangeLog.html b/MP.Prog/Resources/ChangeLog.html
index 24881e4b..26543bcd 100644
--- a/MP.Prog/Resources/ChangeLog.html
+++ b/MP.Prog/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo gestione Programmi MAPO
-
Versione: 8.16.2606.0414
+ Versione: 8.16.2606.0915
Note di rilascio:
diff --git a/MP.Prog/Resources/VersNum.txt b/MP.Prog/Resources/VersNum.txt
index 4ee401ca..56a1118d 100644
--- a/MP.Prog/Resources/VersNum.txt
+++ b/MP.Prog/Resources/VersNum.txt
@@ -1 +1 @@
-8.16.2606.0414
+8.16.2606.0915
diff --git a/MP.Prog/Resources/manifest.xml b/MP.Prog/Resources/manifest.xml
index b2c2df90..a9ec2c12 100644
--- a/MP.Prog/Resources/manifest.xml
+++ b/MP.Prog/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 8.16.2606.0414
+ 8.16.2606.0915
https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/MP.Prog.zip
https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/ChangeLog.html
false
diff --git a/MP.RIOC/MP.RIOC.csproj b/MP.RIOC/MP.RIOC.csproj
index c49c4d6f..debab8d2 100644
--- a/MP.RIOC/MP.RIOC.csproj
+++ b/MP.RIOC/MP.RIOC.csproj
@@ -5,7 +5,7 @@
enable
enable
MP.RIOC
- 8.16.2606.414
+ 8.16.2606.915
diff --git a/MP.RIOC/Resources/ChangeLog.html b/MP.RIOC/Resources/ChangeLog.html
index e784e442..97a94011 100644
--- a/MP.RIOC/Resources/ChangeLog.html
+++ b/MP.RIOC/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MP-RIOC
-
Versione: 8.16.2606.414
+ Versione: 8.16.2606.915
Note di rilascio:
-
diff --git a/MP.RIOC/Resources/VersNum.txt b/MP.RIOC/Resources/VersNum.txt
index b698ae9b..dec9978c 100644
--- a/MP.RIOC/Resources/VersNum.txt
+++ b/MP.RIOC/Resources/VersNum.txt
@@ -1 +1 @@
-8.16.2606.414
+8.16.2606.915
diff --git a/MP.RIOC/Resources/manifest.xml b/MP.RIOC/Resources/manifest.xml
index 02efe83d..9644e6ad 100644
--- a/MP.RIOC/Resources/manifest.xml
+++ b/MP.RIOC/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 8.16.2606.414
+ 8.16.2606.915
https://nexus.steamware.net/repository/SWS/MP-RIOC/stable/LAST/MP.RIOC.zip
https://nexus.steamware.net/repository/SWS/MP-RIOC/stable/LAST/ChangeLog.html
false
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index e9d8a621..87e49583 100644
--- a/MP.SPEC/MP.SPEC.csproj
+++ b/MP.SPEC/MP.SPEC.csproj
@@ -5,7 +5,7 @@
enable
enable
MP.SPEC
- 8.16.2606.817
+ 8.16.2606.915
1800a78a-6ff1-40f9-b490-87fb8bfc1394
en
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index bd04046d..df7cfb29 100644
--- a/MP.SPEC/Resources/ChangeLog.html
+++ b/MP.SPEC/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOSPEC
-
Versione: 8.16.2606.817
+ Versione: 8.16.2606.915
Note di rilascio:
-
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index 6f0f7fc4..dec9978c 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-8.16.2606.817
+8.16.2606.915
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 86ea6299..9af10b4a 100644
--- a/MP.SPEC/Resources/manifest.xml
+++ b/MP.SPEC/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 8.16.2606.817
+ 8.16.2606.915
https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip
https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html
false
diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj
index e05260da..a6e36a0e 100644
--- a/MP.Stats/MP.Stats.csproj
+++ b/MP.Stats/MP.Stats.csproj
@@ -4,7 +4,7 @@
net8.0
MP.Stats
826e877c-ba70-4253-84cb-d0b1cafd4440
- 8.16.2606.0414
+ 8.16.2606.0915
true
en
diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html
index e0d262f2..c67aa6b8 100644
--- a/MP.Stats/Resources/ChangeLog.html
+++ b/MP.Stats/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo statistiche MAPO
-
Versione: 8.16.2606.0414
+ Versione: 8.16.2606.0915
Note di rilascio:
diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt
index 4ee401ca..56a1118d 100644
--- a/MP.Stats/Resources/VersNum.txt
+++ b/MP.Stats/Resources/VersNum.txt
@@ -1 +1 @@
-8.16.2606.0414
+8.16.2606.0915
diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml
index 077827a2..ba90edb1 100644
--- a/MP.Stats/Resources/manifest.xml
+++ b/MP.Stats/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 8.16.2606.0414
+ 8.16.2606.0915
https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip
https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html
false