Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Release/FixRefreshArtDoppiaTav01'

Browse Source
This commit is contained in:
Samuele Locatelli
2024-04-12 15:09:12 +02:00
parent 3aba4c977a 8220942ded
commit 9ceca832d0
7 changed files with 56 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB3/Components/MachSel.razor.cs
+5 -1
View File
@@ -65,7 +65,11 @@ namespace MP_TAB3.Components
protected override async Task OnParametersSetAsync()
{
// inizilamente riporto machcina corrente da MSE
if (RecMSE != null)
if (RecMSE == null)
{
IdxMaccSel = "";
}
else
{
if (string.IsNullOrEmpty(idxMaccSel))
{
MP-TAB3/Components/OdlMan.razor.cs
+46 -18
View File
@@ -260,7 +260,7 @@ namespace MP_TAB3.Components
return;
// preparo gestione progress display
MaxVal = 9;
MaxVal = 10;
isProcessing = true;
int currStep = 0;
await advStep(currStep);
@@ -291,6 +291,24 @@ namespace MP_TAB3.Components
await TabDServ.OdlClearSetup(idxODLCurr, IdxMaccSel);
await advStep(currStep++);
// se è multi processo ANCHE x altra tavola...
if (isMulti)
{
sb.AppendLine("---");
var tabOdlAltra = await TabDServ.OdlCurrByMacc(idxMaccAltraTav, true);
int idxOdlAltra = tabOdlAltra.IdxOdl;
await TabDServ.OdlFineProd(idxOdlAltra, idxMaccAltraTav);
sb.AppendLine(String.Format(evText, idxOdlAltra));
await processaEvento(idxMaccAltraTav, idxEvento, String.Format(evText, idxOdlAltra), idxOdlAltra);
// resetta PODL e rimuove ODL x poi TOGLIERE info di setup su macchina corrente
await TabDServ.OdlClearSetup(idxOdlAltra, idxMaccAltraTav);
await advStep(currStep++);
}
await advStep(currStep++);
// se è master --> chiamo update child!
if (isMaster)
{
@@ -305,7 +323,8 @@ namespace MP_TAB3.Components
}
catch
{ }
RecMSE = null;
await InvokeAsync(StateHasChanged);
// refresh finale
checkAll();
await RefreshData();
@@ -340,6 +359,8 @@ namespace MP_TAB3.Components
lblOut = sb.ToString();
}
await advStep(currStep++);
RecMSE = null;
await InvokeAsync(StateHasChanged);
// update button x setup da altra tavola...
checkAll();
// faccio refresh e riporto
@@ -375,6 +396,8 @@ namespace MP_TAB3.Components
lblOut = sb.ToString();
}
await advStep(currStep++);
RecMSE = null;
await InvokeAsync(StateHasChanged);
// update button x setup da altra tavola...
checkAll();
// faccio refresh e riporto
@@ -484,6 +507,7 @@ namespace MP_TAB3.Components
IdxPOdlSel = 0;
inAttr = false;
RecMSE = null;
await InvokeAsync(StateHasChanged);
// faccio refresh e riporto
await RefreshData();
await CheckAttr();
@@ -695,6 +719,7 @@ namespace MP_TAB3.Components
await TabDServ.FlushOdlCache();
IdxPOdlSel = 0;
RecMSE = null;
await InvokeAsync(StateHasChanged);
await RefreshData();
await CheckAttr();
inAttr = true;
@@ -860,6 +885,7 @@ namespace MP_TAB3.Components
// faccio refresh e riporto
IdxPOdlSel = 0;
RecMSE = null;
await InvokeAsync(StateHasChanged);
currOdl = new ODLExpModel();
inAttr = false;
IdxPOdlSel = 0;
@@ -870,7 +896,6 @@ namespace MP_TAB3.Components
await advStep(currStep++);
isProcessing = false;
await InvokeAsync(StateHasChanged);
//NavMan.NavigateTo(NavMan.Uri, true);
}
protected async Task refreshAfterFixOdl(bool has2Refr)
@@ -1287,25 +1312,28 @@ namespace MP_TAB3.Components
// verifico se NON HA ODL...
if (emptyOdlMacc)
{
// verifico SE siamo nel gracePeriod... chiuso da meno di 1h
DateTime adesso = DateTime.Now;
DateTime dtChiusura = DateTime.Now.AddHours(-1);
try
if (!emptyOdlAltraMacc)
{
var lastOdl = TabDServ.OdlLastByMacc(IdxMaccSel, true);
if (lastOdl != null)
// verifico SE siamo nel gracePeriod... chiuso da meno di 1h
DateTime adesso = DateTime.Now;
DateTime dtChiusura = DateTime.Now.AddHours(-1);
try
{
dtChiusura = lastOdl.DataFine ?? DateTime.Now.AddHours(-1);
var lastOdl = TabDServ.OdlLastByMacc(IdxMaccSel, true);
if (lastOdl != null)
{
dtChiusura = lastOdl.DataFine ?? DateTime.Now.AddHours(-1);
}
}
}
catch
{ }
catch
{ }
// ora verifico SE E SOLO SE è ANCORA in attrezzaggio ora verifico SE ALTRA
// TAVOLA ha ODL...
if (dtChiusura.AddMinutes(gPeriodReopenOdlTav) > adesso)
{
answ = showReopenOdlTav;
// ora verifico SE E SOLO SE è ANCORA in attrezzaggio ora verifico SE ALTRA
// TAVOLA ha ODL...
if (dtChiusura.AddMinutes(gPeriodReopenOdlTav) > adesso)
{
answ = showReopenOdlTav;
}
}
}
}
MP-TAB3/MP-TAB3.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2404.1117</Version>
<Version>6.16.2404.1215</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB3</RootNamespace>
</PropertyGroup>
MP-TAB3/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2404.1117</h4>
<h4>Versione: 6.16.2404.1215</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB3/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2404.1117
6.16.2404.1215
MP-TAB3/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2404.1117</version>
<version>6.16.2404.1215</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>
MP.Data/DatabaseModels/TaskResultModel.cs
+1 -1
View File
@@ -11,7 +11,7 @@ using static MP.Data.Objects.Enums;
// </Auto-Generated>
namespace MP.Data.DatabaseModels
{
[Keyless]
[NotMapped]
public partial class TaskResultModel
{
#region Public Properties