Fix calcolo TC centesimale

This commit is contained in:
Samuele Locatelli
2024-02-28 15:20:16 +01:00
parent f2783e3d37
commit cf6ddb045f
13 changed files with 43 additions and 22 deletions
+2 -5
View File
@@ -1213,9 +1213,6 @@ namespace MP_TAB3.Components
}
private bool setupActive { get; set; } = false;
#if false
private string IdxMaccSelLast = "";
#endif
/// <summary>
/// Verifica visibilità btn riprendi ODL su 2° tavola SE:
@@ -1291,7 +1288,7 @@ namespace MP_TAB3.Components
}
}
private decimal tcRichAttr { get; set; } = 1;
private decimal tcRichAttr { get; set; } = 0;
private string titleOdlDetail
{
@@ -1452,7 +1449,7 @@ namespace MP_TAB3.Components
{
if (tcRichAttr == 0)
{
tcRichAttr = IdxPOdlSel == 0 ? currOdl.Tcassegnato : currPodl.Tcassegnato;
tcRichAttr = IdxPOdlSel == 0 ? currOdl.TCRichAttr : currPodl.Tcassegnato;
}
if (string.IsNullOrEmpty(noteAttr))
{
+7 -2
View File
@@ -95,9 +95,14 @@ namespace MP_TAB3.Components
setupConf();
StartTimer();
currItem = null;
if (RecMSE != null)
}
protected override async Task OnParametersSetAsync()
{
if (RecMSE != null && !RecMSE.MostlyEquals(lastRecMSE))
{
IdxMaccSel = RecMSE.IdxMacchina;
lastRecMSE = RecMSE;
await ReloadData();
}
await Task.Delay(1);
@@ -153,8 +158,8 @@ namespace MP_TAB3.Components
#region Private Properties
private ObjItemDTO? currItem { get; set; } = null;
private string IdxMaccSel { get; set; } = "";
private MappaStatoExpl? lastRecMSE { get; set; } = null;
#endregion Private Properties
+2 -2
View File
@@ -171,7 +171,7 @@ namespace MP_TAB3.Components
/// <returns></returns>
protected TimeSpan minCent2Sec(decimal valore)
{
TimeSpan answ = TimeSpan.FromSeconds((double)valore * 60);
TimeSpan answ = TimeSpan.FromSeconds(Math.Round((double)(valore * 60)));
return answ;
}
@@ -211,7 +211,7 @@ namespace MP_TAB3.Components
/// <summary>
/// tempo min:sec
/// </summary>
private TimeSpan _tempoMS { get; set; } = TimeSpan.FromSeconds(1);
private TimeSpan _tempoMS { get; set; } = TimeSpan.FromSeconds(3599);
private string baseLang
{
@@ -44,9 +44,18 @@ namespace MP_TAB3.Components
{
if (IdxOdl > 0 && !string.IsNullOrEmpty(CodGruppo))
{
await ReloadData();
if (CodArticolo != codArticoloLast || IdxOdl != idxOdlLast || CodGruppo!=codGruppoLast)
{
codArticoloLast = CodArticolo;
idxOdlLast = IdxOdl;
codGruppoLast = CodGruppo;
await ReloadData();
}
}
}
private int idxOdlLast = 0;
private string codArticoloLast = "";
private string codGruppoLast = "";
[Inject]
protected TabDataService TabServ { get; set; } = null!;
@@ -26,8 +26,8 @@ namespace MP_TAB3.Components
{
if (IdxOdl > 0)
{
var rawData = TabDServ.STAR_pendByOdl(IdxOdl);
showChecks = rawData.Count > 0;
var rawData = TabDServ.STAR_pendByOdl(IdxOdl);
showChecks = rawData.Count > 0;
}
else
{
@@ -69,13 +69,20 @@ namespace MP_TAB3.Components
protected override void OnParametersSet()
{
checkInputData();
if (CodArticolo != codArticoloLast || IdxOdl != idxOdlLast)
{
codArticoloLast = CodArticolo;
idxOdlLast = IdxOdl;
checkInputData();
}
}
#endregion Protected Methods
#region Private Fields
private string codArticoloLast = "";
private int idxOdlLast = 0;
private string lastBCodeVal = "";
private string MessageCss = "";
private string MessageText = "";
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2402.2811</Version>
<Version>6.16.2402.2815</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB3</RootNamespace>
</PropertyGroup>
-1
View File
@@ -63,7 +63,6 @@ namespace MP_TAB3.Pages
protected override async Task OnParametersSetAsync()
{
await ReloadData();
//return base.OnParametersSetAsync();
}
/// <summary>
+4 -4
View File
@@ -26,10 +26,10 @@ else
}
else
{
@foreach (var item in events2show)
{
<ProdStopMan objCss="@item.CssClass" objIcon="@item.Icon" objTxt="@(item.label)" IdxEvento="@item.value" E_EventSelected="EventRecord"></ProdStopMan>
}
@foreach (var item in events2show)
{
<ProdStopMan objCss="@item.CssClass" objIcon="@item.Icon" objTxt="@(item.label)" IdxEvento="@item.value" E_EventSelected="EventRecord"></ProdStopMan>
}
}
</div>
}
+3
View File
@@ -223,6 +223,9 @@ namespace MP_TAB3.Pages
rdm_nEvStep = SMServ.GetConfInt("rdm_nEvStep");
rdm_nEvCheck = SMServ.GetConfInt("rdm_nEvCheck");
rdm_ChkOnly = SMServ.GetConfBool("rdm_ChkOnly");
}
protected override async Task OnParametersSetAsync()
{
// leggo gli altri dati
await ReloadData();
}
+1
View File
@@ -10,6 +10,7 @@ namespace MP_TAB3.Pages
await ReloadData();
}
protected void SetMacc(string selIdxMacc)
{
IdxMaccSubSel = selIdxMacc;
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2402.2811</h4>
<h4>Versione: 6.16.2402.2815</h4>
<br /> Note di rilascio:
<ul>
<li>
+1 -1
View File
@@ -1 +1 @@
6.16.2402.2811
6.16.2402.2815
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2402.2811</version>
<version>6.16.2402.2815</version>
<url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>