Fix e test conferma fermate riqualificate

This commit is contained in:
Samuele Locatelli
2023-10-10 18:56:50 +02:00
parent db105b8f9a
commit 2176cbeb88
8 changed files with 214 additions and 60 deletions
+92 -2
View File
@@ -2,7 +2,6 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using MP.Data.DatabaseModels;
using MP.Data.DTO;
using NLog;
using System;
using System.Collections.Generic;
@@ -299,6 +298,39 @@ namespace MP.Data.Controllers
return dbResult;
}
/// <summary>
/// Recupera record successivo da DDB
/// </summary>
/// <param name="idxMacchina"></param>
/// <param name="inizioStato"></param>
/// <returns></returns>
public DiarioDiBordoModel DDB_getNext(string idxMacchina, DateTime inizioStato)
{
DiarioDiBordoModel dbResult = new DiarioDiBordoModel();
using (var dbCtx = new MoonProContext(_configuration))
{
var IdxMacchina = new SqlParameter("@IdxMacchina", idxMacchina);
var DataRif = new SqlParameter("@dataRif", inizioStato);
dbResult = dbCtx
.DbSetDDB
.FromSqlRaw("exec dbo.stp_DDB_getNextByMacchinaFrom @IdxMacchina, @dataRif", IdxMacchina, DataRif)
.AsNoTracking()
.FirstOrDefault();
}
return dbResult;
}
/// <summary>
/// Inserimento record in DDB
/// </summary>
/// <param name="idxMacchina"></param>
/// <param name="inizioStato"></param>
/// <param name="idxStato"></param>
/// <param name="codArt"></param>
/// <param name="value"></param>
/// <param name="matrOpr"></param>
/// <param name="pallet"></param>
/// <returns></returns>
public bool DDB_InsStatoBatch(string idxMacchina, DateTime inizioStato, int idxStato, string codArt, string value, int matrOpr, string pallet)
{
bool fatto = false;
@@ -322,6 +354,40 @@ namespace MP.Data.Controllers
return fatto;
}
/// <summary>
/// Inserimento record in DDB
/// </summary>
/// <param name="idxMacchina"></param>
/// <param name="inizio"></param>
/// <param name="idxStatoStart"></param>
/// <param name="nStepEventi"></param>
/// <param name="nRecCheck"></param>
/// <param name="checkOnly"></param>
/// <returns></returns>
public bool DDB_DoRecalc(string idxMacchina, DateTime inizio, int idxStatoStart, int nStepEventi, int nRecCheck, bool checkOnly)
{
bool fatto = false;
using (var dbCtx = new MoonProContext(_configuration))
{
var IdxMacchina = new SqlParameter("@IdxMacchina", idxMacchina);
var Inizio = new SqlParameter("@inizio", inizio);
var IdxStatoStart = new SqlParameter("@idxStatoStart", idxStatoStart);
var NStepEventi = new SqlParameter("@nStepEventi", nStepEventi);
var NRecCheck = new SqlParameter("@nRecCheck", nRecCheck);
var CheckOnly = new SqlParameter("@CheckOnly", checkOnly);
var result = dbCtx
.Database
.ExecuteSqlRaw("exec man.stp_ricalcolaDatiMacchinaFromDateFork @IdxMacchina, @inizio, @idxStatoStart, @nStepEventi, @nRecCheck, @CheckOnly", IdxMacchina, Inizio, IdxStatoStart, nStepEventi, NRecCheck, CheckOnly);
// indico eseguito!
fatto = result > 0;
}
return fatto;
}
//stp_DDB_getNextByMacchinaFrom
public void Dispose()
{
_configuration = null;
@@ -336,7 +402,6 @@ namespace MP.Data.Controllers
/// <returns></returns>
public bool EvListDelete(string idxMacchina, DateTime dtEvento, int idxTipo)
{
bool fatto = false;
using (var dbCtx = new MoonProContext(_configuration))
{
@@ -438,6 +503,31 @@ namespace MP.Data.Controllers
return dbResult;
}
/// <summary>
/// Imposto abilitazione insert eventi macchina (x fermare/avviare dati da IOB)
/// </summary>
/// <param name="idxMacchina">Idx macchina, "*" = tutte</param>
/// <param name="insEnabled">Abilitazione insert ev macchina</param>
/// <returns></returns>
public bool MacchinaSetInsEnab(string idxMacchina, bool insEnabled)
{
bool fatto = false;
using (var dbCtx = new MoonProContext(_configuration))
{
var IdxMacchina = new SqlParameter("@idxMacchina", idxMacchina);
var InsEnabled = new SqlParameter("@insEnabled", insEnabled);
var result = dbCtx
.Database
.ExecuteSqlRaw("exec dbo.stp_STM_setInsEnabled @idxMacchina, @insEnabled", IdxMacchina, InsEnabled);
// indico eseguito!
fatto = result > 0;
}
return fatto;
}
//stp_STM_setInsEnabled
/// <summary>
/// MicroStato macchina (da key)
/// </summary>
+37 -1
View File
@@ -1,7 +1,6 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using MP.Data.DatabaseModels;
using MP.Data.DTO;
using MP.Data.Objects;
using Newtonsoft.Json;
using NLog;
@@ -292,6 +291,31 @@ namespace MP.Data.Services
return result;
}
/// <summary>
/// Recupera record successivo da DDB
/// </summary>
/// <param name="idxMacchina"></param>
/// <param name="inizioStato"></param>
/// <returns></returns>
public DiarioDiBordoModel DDB_getNext(string idxMacchina, DateTime inizioStato)
{
return dbTabController.DDB_getNext(idxMacchina, inizioStato);
}
/// <summary>
/// Inserimento record in DDB
/// </summary>
/// <param name="idxMacchina"></param>
/// <param name="inizio"></param>
/// <param name="idxStatoStart"></param>
/// <param name="nStepEventi"></param>
/// <param name="nRecCheck"></param>
/// <param name="checkOnly"></param>
/// <returns></returns>
public bool DDB_DoRecalc(string idxMacchina, DateTime inizio, int idxStatoStart, int nStepEventi, int nRecCheck, bool checkOnly)
{
return dbTabController.DDB_DoRecalc(idxMacchina, inizio, idxStatoStart, nStepEventi, nRecCheck, checkOnly);
}
public void Dispose()
{
// Clear database controller
@@ -496,6 +520,18 @@ namespace MP.Data.Services
return result;
}
/// <summary>
/// Effettua ricalcolo MSE x macchina indicata
/// </summary>
/// <param name="idxMacchina">idx macchina da confermare</param>
/// <param name="insEnabled">Abilitazione insert ev macchina</param>
/// <returns></returns>
public bool MacchinaSetInsEnab(string idxMacchina, bool insEnabled)
{
bool answ = dbTabController.MacchinaSetInsEnab(idxMacchina, insEnabled);
return answ;
}
/// <summary>
/// Resetta (rileggendo) i dati della macchina
/// </summary>