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

Merge branch 'Release/FixSetupDoppiaTav01'

Browse Source
This commit is contained in:
Samuele Locatelli
2024-04-12 16:38:32 +02:00
parent 9ceca832d0 92f4a197c5
commit 3d9801180e
5 changed files with 63 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB3/Components/ProdConfirm.razor.cs
+59 -3
View File
@@ -1,6 +1,8 @@
using global::Microsoft.AspNetCore.Components;
using MP.Data.DatabaseModels;
using MP.Data.Services;
using NLog;
using NLog.Fluent;
namespace MP_TAB3.Components
{
@@ -71,6 +73,34 @@ namespace MP_TAB3.Components
protected DateTime dtInizio { get; set; } = DateTime.Today.AddMonths(-2);
/// <summary>
/// Restituisce il codice IdxMacchina dell'altra tavola (se multi) altrimenti la stessa macchina...
/// </summary>
protected string idxMaccAltraTav
{
get
{
string answ = "";
try
{
// verifico se SIA una tavola (ha char "#")
int iSharp = IdxMaccSel.IndexOf('#');
if (iSharp > 0)
{
// ora verifico SE ALTRA TAVOLA ha ODL...
string nomeTav = IdxMaccSel.Substring(iSharp);
string altraTav = nomeTav.Substring(0, nomeTav.Length - 1);
altraTav += nomeTav.EndsWith("1") ? "2" : "1";
// sistemo nome
answ = IdxMaccSel.Replace(nomeTav, altraTav);
}
}
catch
{ }
return answ;
}
}
protected int lblPz2RecBuoni
{
get => numPzConfermati - numPzLasciati;
@@ -124,7 +154,33 @@ namespace MP_TAB3.Components
/// </summary>
protected bool odlOk
{
get => (RecMSE != null && RecMSE.IdxOdl > 0);
get
{
bool answ = (RecMSE != null && RecMSE.IdxOdl > 0);
if (isMulti && (!answ && RecMSE != null && IdxMaccSel != RecMSE?.IdxMacchina))
{
int idxOdlSel = 0;
try
{
var pUpd = Task.Run(async () =>
{
var tabOdlSel = await TabDServ.OdlCurrByMacc(IdxMaccSel, true);
idxOdlSel = tabOdlSel.IdxOdl;
});
pUpd.Wait();
answ = idxOdlSel > 0;
}
catch (Exception exc)
{
Log.Error($"Errore Durante recupero idxOdlSel {Environment.NewLine}{exc}");
}
}
else
{
answ = (RecMSE != null && RecMSE.IdxOdl > 0);
}
return answ;
}
}
[Inject]
@@ -181,8 +237,6 @@ namespace MP_TAB3.Components
{
numPzLasciati = 0;
}
// verifico SE fosse doppia...
bool isMulti = false;
// verifico se la macchina sia configurata tra le MSFD...
if (SMServ.DictMacchMulti.ContainsKey(RecMSE.IdxMacchina))
{
@@ -271,10 +325,12 @@ namespace MP_TAB3.Components
#region Private Fields
private static Logger Log = LogManager.GetCurrentClassLogger();
private bool chkPzBuoniNeg = false;
private bool confRett = false;
private bool enableMagPrint = false;
private bool enablePzProdLasciati = false;
private bool isMulti = false;
private string lblOut = "";
private int modoConfProd = 0;
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.1215</Version>
<Version>6.16.2404.1216</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.1215</h4>
<h4>Versione: 6.16.2404.1216</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB3/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2404.1215
6.16.2404.1216
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.1215</version>
<version>6.16.2404.1216</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>