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

Merge branch 'Release/UpdateConfProd_01'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-07-31 17:45:34 +02:00
parent 25413a22c0 067363a1cb
commit af535fd526
7 changed files with 94 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB3/Components/ProdConfMan.razor
+66 -9
View File
@@ -29,15 +29,31 @@
<div class="col-12">
<table class="table table-dark table-sm table-striped">
<thead>
<tr class="text-start1">
<th>Art/ODL</th>
<th class="text-end"># Pz Buoni</th>
<th class="text-end"># Pz Scarto</th>
<tr>
<th class="row">
<div class="col-4">
Art/ODL
</div>
<div class="col-4 text-end text-nowrap">
<div class="row">
<div class="col px-0"># Buoni</div>
<div class="col px-0"># Scarto</div>
@if (ShowRilav)
{
<div class="col px-0"># Rilav</div>
}
</div>
</div>
<div class="col-4 text-end">Operatore</div>
</th>
@* <th>Art/ODL</th>
<th class="text-end"># Buoni</th>
<th class="text-end"># Scarto</th>
@if (ShowRilav)
{
<th class="text-end"># Pz Rilav</th>
<th class="text-end"># Rilav</th>
}
<th class="text-end">Operatore</th>
<th class="text-end">Operatore</th> *@
</tr>
</thead>
<tbody>
@@ -45,7 +61,46 @@
{
var actOdl = ActiveOdl(item.DataTo);
<tr>
<td class="text-nowrap">
<td class="row">
<div class="col-4 text-nowrap">
<div>Art: <b>@actOdl.CodArticolo</b></div>
<div>ODL: <b>@($"ODL{actOdl.IdxOdl:000000000}")</b></div>
</div>
<div class="col-4 text-end text-nowrap">
<div class="row">
<div class="col fs-4 fw-bold">@item.PezziConf</div>
<div class="col fs-4 fw-bold">@item.PezziScar</div>
@if (ShowRilav)
{
<div class="col fs-4 fw-bold">@item.PezziDaRilav</div>
}
</div>
</div>
<div class="col-4 text-end">
<div>@($"{item.DataOraConf:ddd yyyy-MM-dd HH:mm:ss}")</div>
<div><b>@OperDto(item.MatrApp)</b> <i class="fa fa-user" aria-hidden="true"></i></div>
</div>
@if (ShowExtCode || ShowArtDescr)
{
<div class="col-12 col-sm-6">
@if (ShowExtCode)
{
<div class="px-1">@item.CommessaEsterna</div>
}
</div>
<div class="col-12 col-sm-6 text-end">
@if (ShowArtDescr)
{
<div class="px-0 ps-1 d-flex flex-row-reverse">
<div class="text-truncate small" style="max-width: 15rem;" title="@actOdl.DescArticolo">@actOdl.DescArticolo</div>
</div>
}
</div>
}
</td>
@* <td class="text-nowrap">
<div>Art: <b>@actOdl.CodArticolo</b></div>
<div>ODL: <b>@($"ODL{actOdl.IdxOdl:000000000}")</b></div>
@if (ShowExtCode)
@@ -64,9 +119,11 @@
<div><b>@OperDto(item.MatrApp)</b> <i class="fa fa-user" aria-hidden="true"></i></div>
@if (ShowArtDescr)
{
<div class="px-0 ps-1 text-truncate" style="max-width: 20rem;" title="@actOdl.DescArticolo">@actOdl.DescArticolo</div>
<div class="px-0 ps-1 d-flex flex-row-reverse">
<div class="text-truncate small" style="max-width: 12rem;" title="@actOdl.DescArticolo">@actOdl.DescArticolo</div>
</div>
}
</td>
</td> *@
</tr>
}
</tbody>
MP-TAB3/Components/ProdConfMan.razor.cs
-23
View File
@@ -316,29 +316,6 @@ namespace MP_TAB3.Components
return answ;
}
#if false
private MarkupString OperDto(int matr)
{
string answ = $"[{matr}]";
// cerco in dizionario
if (DictOpr.ContainsKey(matr))
{
answ = DictOpr[matr];
}
else
{
// altrimenti cerco da lista e inserisco in dizionario
var recOpr = ListaOper.Where(x => x.MatrOpr == matr).FirstOrDefault();
if (recOpr != null)
{
answ = $"{recOpr.Cognome} {recOpr.Nome}<sup>{matr}</sup>";
}
DictOpr.Add(matr, answ);
}
return (MarkupString)answ;
}
#endif
/// <summary>
/// Rileggo anagrafiche di base
/// </summary>
MP-TAB3/Components/ProdConfirm.razor.cs
+24 -11
View File
@@ -53,6 +53,7 @@ namespace MP_TAB3.Components
{
datiProdAct = null;
confTimer.Elapsed -= ConfTimer_Elapsed;
confTimer.Close();
}
#endregion Public Methods
@@ -248,8 +249,10 @@ namespace MP_TAB3.Components
confRett = SMServ.GetConfBool("confRett");
enableMagPrint = SMServ.GetConfBool("enableMagPrint");
modoConfProd = SMServ.GetConfInt("modoConfProd");
int tOutConfProd = SMServ.GetConfInt("TAB_TimeOutConfProd");
confTimer = new System.Timers.Timer(tOutConfProd);
tOutConfProd = SMServ.GetConfInt("TAB_TimeOutConfProd");
// petto periodo a 100ms x controllare scadenze
confTimer = new System.Timers.Timer(100);
//confTimer = new System.Timers.Timer(tOutConfProd);
confTimer.Elapsed += ConfTimer_Elapsed;
}
@@ -294,6 +297,8 @@ namespace MP_TAB3.Components
// effettua conferma con conf da DB del tipo (giorni / turni / periodo
bool fatto = effettuaConfermaProd();
await TabDServ.FlushCache("StatoProd");
await TabDServ.FlushCache("ODL");
await TabDServ.FlushCache("ElConfProd");
// refresh tabella dati tablet...
await TabDServ.RicalcMse(IdxMaccSel, 0);
// rileggo e salvo..
@@ -320,12 +325,13 @@ namespace MP_TAB3.Components
SDService.MachNumPzSet(IdxMaccSel, -1);
await DoUpdate();
await RefreshData();
TabDServ.NotifyDataInvalidated(IdxMaccSel);
isProcessing = false;
// imposto visualizzazione conferma effettuata
showConfirmResult = true;
// avvio timer x nascondere...
// imposto timeout display + avvio timer x nascondere...
scadConfPezzi = dtReqUpdate.AddMilliseconds(tOutConfProd);
confTimer.Start();
TabDServ.NotifyDataInvalidated(IdxMaccSel);
isProcessing = false;
}
protected void setConfirmBtn(bool newVal)
@@ -397,7 +403,9 @@ namespace MP_TAB3.Components
private int modoConfProd = 0;
private DateTime scadConfPezzi = DateTime.Today;
private bool showConfirmResult = false;
private int tOutConfProd = 2000;
#endregion Private Fields
@@ -435,12 +443,17 @@ namespace MP_TAB3.Components
/// <param name="e"></param>
private void ConfTimer_Elapsed(object? sender, System.Timers.ElapsedEventArgs e)
{
confTimer.Stop();
showConfirmResult = false;
// resetto
lastPzBuoni = 0;
lastPzRilav = 0;
lastPzScarto = 0;
DateTime adesso = DateTime.Now;
// controllo se sia ascaduto il periodo di display
if (adesso > scadConfPezzi)
{
confTimer.Stop();
showConfirmResult = false;
// resetto
lastPzBuoni = 0;
lastPzRilav = 0;
lastPzScarto = 0;
}
}
/// <summary>
MP-TAB3/MP-TAB3.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2507.2909</Version>
<Version>6.16.2507.3108</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.2507.2909</h4>
<h4>Versione: 6.16.2507.3108</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB3/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2507.2909
6.16.2507.3108
MP-TAB3/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2507.2909</version>
<version>6.16.2507.3108</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>