diff --git a/MP-TAB-SERV/Components/MachSel.razor.cs b/MP-TAB-SERV/Components/MachSel.razor.cs
index 15f7127c..e52e6a81 100644
--- a/MP-TAB-SERV/Components/MachSel.razor.cs
+++ b/MP-TAB-SERV/Components/MachSel.razor.cs
@@ -30,12 +30,12 @@ namespace MP_TAB_SERV.Components
#region Protected Methods
- protected override async Task OnInitializedAsync()
+
+ protected override async Task OnParametersSetAsync()
{
// inizilamente riporto machcina corrente da MSE
if (RecMSE != null)
{
- await E_MachSel.InvokeAsync(RecMSE?.IdxMacchina);
// verifico se la macchina sia configurata tra le MSFD...
if (MServ.DictMacchMulti.ContainsKey(RecMSE?.IdxMacchina))
{
@@ -43,6 +43,8 @@ namespace MP_TAB_SERV.Components
}
ListMacchineAll = MServ.DictMacchine;
}
+ //await E_MachSel.InvokeAsync(RecMSE?.IdxMacchina);
+ await Task.Delay(1);
}
#endregion Protected Methods
diff --git a/MP-TAB-SERV/Components/ProdAdvDispl.razor b/MP-TAB-SERV/Components/ProdAdvDispl.razor
index fd61c443..fd01bb8d 100644
--- a/MP-TAB-SERV/Components/ProdAdvDispl.razor
+++ b/MP-TAB-SERV/Components/ProdAdvDispl.razor
@@ -9,113 +9,9 @@
@($"{NumGray}%")
- @($"{NumBlue}%")
+ @($"+{NumBlue}%")
-@code {
- ///
- /// Conteggio dati produzione da mostrare
- ///
- [Parameter]
- public ProdCounter CountData { get; set; } = null!;
- ///
- /// Numero pezzi CONFERMATI
- ///
- protected int NumPzConf { get; set; } = 0;
-
- ///
- /// Numero pezzi ORDINATI
- ///
- protected int NumPzOrd { get; set; } = 0;
-
- ///
- /// Numero pezzi PRODOTTI
- ///
- protected int NumPzProd { get; set; } = 0;
-
-
- ///
- /// Numero pezzi per display BLU
- ///
- protected int NumBlue { get; set; } = 0;
-
- ///
- /// Numero pezzi per display GRIGIO
- ///
- protected int NumGray { get; set; } = 40;
-
- ///
- /// Numero pezzi per display VERDE
- ///
- protected int NumGreen { get; set; } = 20;
-
- ///
- /// Numero pezzi per display GIALLO
- ///
- protected int NumYellow { get; set; } = 30;
-
- protected override void OnParametersSet()
- {
- decimal denom = CountData.numPzProd > CountData.numPzOrd ? (decimal)CountData.numPzProd / 100 : (decimal)CountData.numPzOrd / 100;
- denom = denom == 0 ? 1 : denom;
- // calcolo se sono nel caso prod < ordinati o se sono andato OVER
- if (CountData.numPzProd < CountData.numPzOrd)
- {
- nGreen = (int)Math.Floor((decimal)CountData.numPzConf / denom);
- nYellow = (int)Math.Floor((decimal)(CountData.numPzProd - CountData.numPzConf) / denom);
- nGray = 100 - (nGreen + nYellow);
- nBlue = 0;
- }
- else
- {
- // devo verificare SE ne ho confermati meno che ordinati o meno...
- if (CountData.numPzConf < CountData.numPzOrd)
- {
- nGreen = (int)Math.Floor((decimal)CountData.numPzConf / denom);
- }
- else
- {
- nGreen = (int)Math.Floor((decimal)CountData.numPzOrd / denom);
- }
- nBlue = 100 - nGreen;
- nYellow = 0;
- nGray = 0;
- }
- // disegno!
- NumGreen = nGreen;
- NumYellow = nYellow;
- NumGray = nGray;
- NumBlue = nBlue;
- // base.OnParametersSet();
- }
-
- protected int nBlue = 0;
- protected int nGray = 0;
- protected int nGreen = 0;
- protected int nYellow = 0;
-
- ///
- /// Classe gesitone conteggi produzione
- ///
- public class ProdCounter
- {
-
- ///
- /// NUmero pezzi CONFERMATI
- ///
- public int numPzConf { get; set; } = 0;
-
- ///
- /// Numero pezzi ORDINATI
- ///
- public int numPzOrd { get; set; } = 0;
-
- ///
- /// Numero pezzi PRODOTTI
- ///
- public int numPzProd { get; set; } = 0;
- }
-}
diff --git a/MP-TAB-SERV/Components/ProdAdvDispl.razor.cs b/MP-TAB-SERV/Components/ProdAdvDispl.razor.cs
new file mode 100644
index 00000000..1b73ea39
--- /dev/null
+++ b/MP-TAB-SERV/Components/ProdAdvDispl.razor.cs
@@ -0,0 +1,139 @@
+using global::Microsoft.AspNetCore.Components;
+
+namespace MP_TAB_SERV.Components
+{
+ public partial class ProdAdvDispl
+ {
+ #region Public Properties
+
+ ///
+ /// Conteggio dati produzione da mostrare
+ ///
+ [Parameter]
+ public ProdCounter CountData { get; set; } = null!;
+
+ #endregion Public Properties
+
+ #region Public Classes
+
+ ///
+ /// Classe gesitone conteggi produzione
+ ///
+ public class ProdCounter
+ {
+ #region Public Properties
+
+ ///
+ /// NUmero pezzi CONFERMATI
+ ///
+ public int numPzConf { get; set; } = 0;
+
+ ///
+ /// Numero pezzi ORDINATI
+ ///
+ public int numPzOrd { get; set; } = 0;
+
+ ///
+ /// Numero pezzi PRODOTTI
+ ///
+ public int numPzProd { get; set; } = 0;
+
+ #endregion Public Properties
+ }
+
+ #endregion Public Classes
+
+ #region Protected Fields
+
+ protected int nBlue = 0;
+
+ protected int nGray = 0;
+
+ protected int nGreen = 0;
+
+ protected int nYellow = 0;
+
+ #endregion Protected Fields
+
+ #region Protected Properties
+
+ ///
+ /// Numero pezzi per display BLU
+ ///
+ protected int NumBlue { get; set; } = 0;
+
+ ///
+ /// Numero pezzi per display GRIGIO
+ ///
+ protected int NumGray { get; set; } = 40;
+
+ ///
+ /// Numero pezzi per display VERDE
+ ///
+ protected int NumGreen { get; set; } = 20;
+
+ ///
+ /// Numero pezzi CONFERMATI
+ ///
+ protected int NumPzConf { get; set; } = 0;
+
+ ///
+ /// Numero pezzi ORDINATI
+ ///
+ protected int NumPzOrd { get; set; } = 0;
+
+ ///
+ /// Numero pezzi PRODOTTI
+ ///
+ protected int NumPzProd { get; set; } = 0;
+
+ ///
+ /// Numero pezzi per display GIALLO
+ ///
+ protected int NumYellow { get; set; } = 30;
+
+ #endregion Protected Properties
+
+ #region Protected Methods
+
+ protected override void OnParametersSet()
+ {
+ decimal denom = (decimal)CountData.numPzOrd / 100; //CountData.numPzProd > CountData.numPzOrd ? (decimal)CountData.numPzProd / 100 : (decimal)CountData.numPzOrd / 100;
+ denom = denom == 0 ? 1 : denom;
+ // calcolo se sono nel caso prod < ordinati o se sono andato OVER
+ if (CountData.numPzProd < CountData.numPzOrd)
+ {
+ nGreen = (int)Math.Floor((decimal)CountData.numPzConf / denom);
+ nYellow = (int)Math.Floor((decimal)(CountData.numPzProd - CountData.numPzConf) / denom);
+ nGray = 100 - (nGreen + nYellow);
+ nBlue = 0;
+ }
+ else
+ {
+ // green: confermati verdi
+ // devo verificare SE ne ho confermati meno che ordinati o meno...
+ if (CountData.numPzConf < CountData.numPzOrd)
+ {
+ nGreen = (int)Math.Floor((decimal)CountData.numPzConf / denom);
+ }
+ else
+ {
+ nGreen = (int)Math.Floor((decimal)CountData.numPzOrd / denom);
+ }
+ // blu: quanti sono "extra" e da confermare
+ nBlue = (int)Math.Floor((decimal)(CountData.numPzProd) / denom) - nGreen;
+ nYellow = 0;
+ nGray = 0;
+ }
+
+ // disegno!
+ NumGreen = nGreen;
+ NumYellow = nYellow;
+ NumGray = nGray;
+ NumBlue = nBlue;
+ // base.OnParametersSet();
+ }
+
+ #endregion Protected Methods
+ }
+}
\ No newline at end of file
diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor b/MP-TAB-SERV/Components/ProdConfirm.razor
index 10d40bb4..d6d902e3 100644
--- a/MP-TAB-SERV/Components/ProdConfirm.razor
+++ b/MP-TAB-SERV/Components/ProdConfirm.razor
@@ -16,8 +16,6 @@
{
MANCA ODL: conferma NON permessa
}
-
-
@if (showInnov)
diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor.cs b/MP-TAB-SERV/Components/ProdConfirm.razor.cs
index e928f0ce..d8bf5d93 100644
--- a/MP-TAB-SERV/Components/ProdConfirm.razor.cs
+++ b/MP-TAB-SERV/Components/ProdConfirm.razor.cs
@@ -133,6 +133,8 @@ namespace MP_TAB_SERV.Components
[Inject]
protected TabDataService TabDServ { get; set; } = null!;
+ [Inject]
+ protected StatusData MDataService { get; set; } = null!;
#endregion Protected Properties
@@ -154,11 +156,21 @@ namespace MP_TAB_SERV.Components
protected async Task SalvaConfPz()
{
+ isProcessing = true;
await Task.Delay(1);
// effettua conferma con conf da DB del tipo (giorni / turni / periodo
bool fatto = effettuaConfermaProd();
// refresh tabella dati tablet...
TabDServ.RicalcMse(IdxMaccSel, 0);
+ // rileggo e salvo..
+ var ListMSE = await MDataService.MseGetAll();
+ if (ListMSE != null)
+ {
+ // salvo in LocalStorage...
+ await MServ.SaveMse(ListMSE);
+ // aggiorno MSE attuale
+ RecMSE = ListMSE.Find(x => x.IdxMacchina == IdxMaccSel);
+ }
// mostro output
lblOut = $"Confermata produzione {numPzConfermati - numPzLasciati} pezzi (+{numPzLasciati} pz lasciati, +{numPzScarto2Rec:N0} pz scarto) |{dtReqUpdate:HH:mm:ss} | {dtReqUpdate:ddd yyyy.MM.dd}";
// cambio button conferma...
@@ -167,6 +179,8 @@ namespace MP_TAB_SERV.Components
dtReqUpdate = DateTime.Now;
numPzLasciati = 0;
await doUpdate();
+ isProcessing = false;
+ await Task.Delay(1);
await E_newVal.InvokeAsync(true);
}
diff --git a/MP-TAB-SERV/Components/TcHistoryFilter.razor.cs b/MP-TAB-SERV/Components/TcHistoryFilter.razor.cs
index eed386c0..22d92672 100644
--- a/MP-TAB-SERV/Components/TcHistoryFilter.razor.cs
+++ b/MP-TAB-SERV/Components/TcHistoryFilter.razor.cs
@@ -47,7 +47,7 @@ namespace MP_TAB_SERV.Components
}
[Inject]
- protected ListSelectDataSrv CtrDataServ { get; set; } = null!;
+ protected ListSelectDataSrv MDataService { get; set; } = null!;
protected int DisplayCount { get; set; } = 0;
@@ -136,7 +136,7 @@ namespace MP_TAB_SERV.Components
if (!ListArtDisabled)
{
Log.Debug("START GetArticoli");
- var rawData = await CtrDataServ.ArticoliGetSearch(10000, "*", searchVal);
+ var rawData = await MDataService.ArticoliGetSearch(10000, "*", searchVal);
// trasformo!
if (rawData != null)
{
@@ -169,7 +169,7 @@ namespace MP_TAB_SERV.Components
if (ListMacchineAll == null || ListMacchineAll.Count == 0)
{
Log.Debug("START ReloadMacchine");
- var rawData = await CtrDataServ.MacchineByMatrOper(MatrOpr);
+ var rawData = await MDataService.MacchineByMatrOper(MatrOpr);
// trasformo!
if (rawData != null)
{
diff --git a/MP-TAB-SERV/Pages/MachineDetail.razor.cs b/MP-TAB-SERV/Pages/MachineDetail.razor.cs
index 0db82aaf..f4f24b32 100644
--- a/MP-TAB-SERV/Pages/MachineDetail.razor.cs
+++ b/MP-TAB-SERV/Pages/MachineDetail.razor.cs
@@ -70,6 +70,16 @@ namespace MP_TAB_SERV.Pages
#endif
}
+ protected async Task RefreshMBlock()
+ {
+ // recupero MSE macchina....
+ if (!string.IsNullOrEmpty(IdxMacc))
+ {
+ CurrMSE = await MsgServ.GetMachineMse(IdxMacc);
+ }
+ await Task.Delay(1);
+ }
+
private async Task ReloadData()
{
if (string.IsNullOrEmpty(IdxMacc))
diff --git a/MP-TAB-SERV/Pages/StatusMap.razor.cs b/MP-TAB-SERV/Pages/StatusMap.razor.cs
index 161957ad..fc20af4d 100644
--- a/MP-TAB-SERV/Pages/StatusMap.razor.cs
+++ b/MP-TAB-SERV/Pages/StatusMap.razor.cs
@@ -24,7 +24,7 @@ namespace MP_TAB_SERV.Pages
protected StatusData MDataService { get; set; } = null!;
[Inject]
- protected MessageService MsgServ { get; set; } = null!;
+ protected MessageService MServ { get; set; } = null!;
protected int slowRefreshMs
{
@@ -126,7 +126,7 @@ namespace MP_TAB_SERV.Pages
if (ListMSE != null)
{
// salvo in LocalStorage...
- await MsgServ.SaveMse(ListMSE);
+ await MServ.SaveMse(ListMSE);
}
}
@@ -164,15 +164,6 @@ namespace MP_TAB_SERV.Pages
private async Task ReloadData()
{
ListMSE = await MDataService.MseGetAll();
- //try
- //{
- // // salvo in LocalStorage...
- // await MsgServ.SaveMse(CurrListMSE);
- //}
- //catch (Exception exc)
- //{
- // Log.Error($"Eccezione in ReloadData{Environment.NewLine}{exc}");
- //}
}
private async Task setupConf()
diff --git a/MP-TAB-SERV/Shared/MainLayout.razor b/MP-TAB-SERV/Shared/MainLayout.razor
index c858bc1c..54c29e92 100644
--- a/MP-TAB-SERV/Shared/MainLayout.razor
+++ b/MP-TAB-SERV/Shared/MainLayout.razor
@@ -92,6 +92,7 @@
{
var allData = await MDataService.ListLinkAll();
MStor.SetupMenu(allData);
+
// fix config...
var allConf = await MDataService.ConfigGetAll();
MStor.SetConfig(allConf);
@@ -99,6 +100,11 @@
// fix MSFD...
var allMSFD = await TDataService.VMSFDGetAll();
MStor.SetMsfd(allMSFD);
+
+ // non da farsi globalmente
+ // // fix macchine
+ // var allMach = await MDataService.MacchineByMatrOper(0);
+ // MStor.DictMacchine = allMach.ToDictionary(x => x.IdxMacchina, x => $"{x.IdxMacchina} | {x.Nome}");
}
CurrLevel = MStor.PageLevel(NavMan.Uri);
// recupero menù
diff --git a/MP-TAB-SERV/wwwroot/images/LogoEgw.png b/MP-TAB-SERV/wwwroot/images/LogoEgw.png
new file mode 100644
index 00000000..8d5a7c1f
Binary files /dev/null and b/MP-TAB-SERV/wwwroot/images/LogoEgw.png differ
diff --git a/MP.Data/Services/ListSelectDataSrv.cs b/MP.Data/Services/ListSelectDataSrv.cs
index 8a7bfa32..fffbbc44 100644
--- a/MP.Data/Services/ListSelectDataSrv.cs
+++ b/MP.Data/Services/ListSelectDataSrv.cs
@@ -38,8 +38,8 @@ namespace MP.Data.Services
}
else
{
- dbController = new Controllers.MpSpecController(configuration);
StringBuilder sb = new StringBuilder();
+ dbController = new Controllers.MpSpecController(configuration);
sb.AppendLine($"ListSelectDataSrv | MpSpecController OK");
Log.Info(sb.ToString());
}
diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs
index a4a1070c..3f64d476 100644
--- a/MP.Data/Services/TabDataService.cs
+++ b/MP.Data/Services/TabDataService.cs
@@ -44,8 +44,8 @@ namespace MP.Data.Services
#region Public Properties
- public static Controllers.MpIocController dbIocController { get; set; } = null!;
- public static Controllers.MpTabController dbTabController { get; set; } = null!;
+ private static Controllers.MpIocController dbIocController { get; set; } = null!;
+ private static Controllers.MpTabController dbTabController { get; set; } = null!;
#endregion Public Properties