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

Fix conferma produzione

Browse Source
This commit is contained in:
Samuele Locatelli
2023-12-19 15:27:29 +01:00
parent 16e1b58b41
commit cf7fa880ae
8 changed files with 120 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB3/Components/CheckControls.razor.cs
+1 -1
View File
@@ -37,7 +37,7 @@ namespace MP_TAB3.Components
{
try
{
// in questo caso controllo idxStato... e recupero priorit� se > 1 -->
// in questo caso controllo idxStato... e recupero priorita se > 1 -->
// richiesta qualifica
answ = SMServ.GetStateRow(idxStato).Priorita > 1;
}
MP-TAB3/Components/ProdConfirm.razor
+80 -75
View File
@@ -27,7 +27,7 @@
</div>
@if (showInnov)
@if (confProdActive)
{
<div class="cardBg p-2 mt-2">
<div class="d-flex justify-content-between">
@@ -92,89 +92,90 @@
</div>
}
<div class="row textCondens mt-2">
<div class="col-12 py-0 text-start text-uppercase lh-1 fw-bold">
Dati Globali ODL
</div>
<div class="col-6 col-sm-3 py-1">
<div class="text-center h-100 px-2 shadows" style=" background-color: #fff3cd; border-radius: .5rem;">
<div class="text-truncate lh-sm pt-1">
<span class="text-dark small">[A] NUOVI Pz.Prod</span>
@if (!confProdActive)
{
<div class="row textCondens mt-2">
<div class="col-12 py-0 text-start text-uppercase lh-1 fw-bold">
Dati Globali ODL
</div>
<div class="col-6 col-sm-3 py-1">
<div class="text-center h-100 px-2 shadows" style=" background-color: #fff3cd; border-radius: .5rem;">
<div class="text-truncate lh-sm pt-1">
<span class="text-dark small">[A] NUOVI Pz.Prod</span>
</div>
<div class="text-dark d-flex align-items-center text-center justify-content-center">
@if (isProcessing)
{
<i class="fa-solid fa-spinner span"></i>
}
else
{
<span class="fw-bold fs-3">@numPzProdotti2Rec</span>
}
</div>
</div>
<div class="text-dark d-flex align-items-center text-center justify-content-center">
@if (isProcessing)
{
<i class="fa-solid fa-spinner span"></i>
}
else
{
<span class="fw-bold fs-3">@numPzProdotti2Rec</span>
}
</div>
<div class="col-6 col-sm-3 py-1">
<div class="text-center h-100 px-2" style=" background-color: #cff4fc; border-radius: .5rem;">
<div class="text-truncate lh-sm pt-1">
<span class="text-dark small">Pz Prodotti TOT [A+B+C]</span>
</div>
<div class="text-dark d-flex align-items-center text-center justify-content-center">
@if (isProcessing)
{
<i class="fa-solid fa-spinner span"></i>
}
else
{
<span class="fw-bold fs-3">@numPzProdotti</span>
}
</div>
</div>
</div>
<div class="col-6 col-sm-3 py-1">
<div class="text-center h-100 px-2" style=" background-color: #f8d7da; border-radius: .5rem;">
<div class="text-truncate lh-sm pt-1">
<span class="text-dark small">[B] Scarti VERS.</span>
</div>
<div class="text-dark d-flex align-items-center text-center justify-content-center">
@if (isProcessing)
{
<i class="fa-solid fa-spinner span"></i>
}
else
{
<span class="fw-bold fs-3">@numPzScaConf</span>
}
</div>
</div>
</div>
<div class="col-6 col-sm-3 py-1">
<div class="text-center h-100 px-2" style=" background-color: #d1e7dd; border-radius: .5rem;">
<div class="text-truncate lh-sm pt-1">
<span class="text-dark small">[C] Pz Buoni VERS.</span>
</div>
<div class="text-dark d-flex align-items-center text-center justify-content-center">
@if (isProcessing)
{
<i class="fa-solid fa-spinner span"></i>
}
else
{
<span class="fw-bold fs-3">@numPzBuoniConf</span>
}
</div>
</div>
</div>
</div>
<div class="col-6 col-sm-3 py-1">
<div class="text-center h-100 px-2" style=" background-color: #cff4fc; border-radius: .5rem;">
<div class="text-truncate lh-sm pt-1">
<span class="text-dark small">Pz Prodotti TOT [A+B+C]</span>
</div>
<div class="text-dark d-flex align-items-center text-center justify-content-center">
@if (isProcessing)
{
<i class="fa-solid fa-spinner span"></i>
}
else
{
<span class="fw-bold fs-3">@numPzProdotti</span>
}
</div>
</div>
</div>
<div class="col-6 col-sm-3 py-1">
<div class="text-center h-100 px-2" style=" background-color: #f8d7da; border-radius: .5rem;">
<div class="text-truncate lh-sm pt-1">
<span class="text-dark small">[B] Scarti VERS.</span>
</div>
<div class="text-dark d-flex align-items-center text-center justify-content-center">
@if (isProcessing)
{
<i class="fa-solid fa-spinner span"></i>
}
else
{
<span class="fw-bold fs-3">@numPzScaConf</span>
}
</div>
</div>
</div>
<div class="col-6 col-sm-3 py-1">
<div class="text-center h-100 px-2" style=" background-color: #d1e7dd; border-radius: .5rem;">
<div class="text-truncate lh-sm pt-1">
<span class="text-dark small">[C] Pz Buoni VERS.</span>
</div>
<div class="text-dark d-flex align-items-center text-center justify-content-center">
@if (isProcessing)
{
<i class="fa-solid fa-spinner span"></i>
}
else
{
<span class="fw-bold fs-3">@numPzBuoniConf</span>
}
</div>
</div>
</div>
</div>
<div class="row textCondens mt-1 py-1">
<div class="row textCondens mt-1 py-1">
<div class="col-6">
<a class="btn btn-info btn-sm w-100 py-2 " style="min-width: 6rem;" href="scrap"><i class="fa fa-bug"></i> Reg. SCARTI</a>
</div>
<div class=" col-6">
<a class="btn btn-primary btn-sm w-100 py-2" style="min-width: 6rem;" href="controls"><i class="fa fa-wrench"></i> Reg. CONTROLLI</a>
</div>
@* <div class="d-flex justify-content-between p-3 pe-4">
</div> *@
</div>
</div>
}
@if (!string.IsNullOrEmpty(lblOut))
{
<div class="d-flex justify-content-around my-2">
@@ -183,4 +184,8 @@
</div>
</div>
}
<ShowProcessing IsProcessing="@isProcessing"></ShowProcessing>
<ShowProcessing IsProcessing="@isProcessing"></ShowProcessing>
@if (!confProdActive)
{
<ProdStat RecMSE="RecMSE"></ProdStat>
}
MP-TAB3/Components/ProdConfirm.razor.cs
+35 -16
View File
@@ -38,7 +38,20 @@ namespace MP_TAB3.Components
}
[Parameter]
public MappaStatoExpl? RecMSE { get; set; } = null;
public MappaStatoExpl? RecMSE
{
get => currRecMSE;
set
{
// salvo SOLO SE non sono in conferma
if (!confProdActive)
{
currRecMSE = value;
}
}
}
private MappaStatoExpl? currRecMSE { get; set; } = null;
#endregion Public Properties
@@ -46,16 +59,17 @@ namespace MP_TAB3.Components
protected string ConfBg
{
get => showInnov ? "bg-warning text-dark" : "bg-success text-light";
get => confProdActive ? "bg-warning text-dark" : "bg-success text-light";
}
protected string ConfCssWidth
{
get => enableMagPrint ? "col-6" : "col-12";
}
protected string ConfTitle
{
get => showInnov ? "Nascondi conferma" : "Mostra conferma";
}
protected string ConfCssWidth
{
get => enableMagPrint ? "col-6" : "col-12";
get => confProdActive ? "Nascondi conferma" : "Mostra conferma";
}
/// <summary>
@@ -163,9 +177,12 @@ namespace MP_TAB3.Components
protected override async Task OnParametersSetAsync()
{
lblOut = "";
numPzLasciati = 0;
if (RecMSE != null && string.IsNullOrEmpty(IdxMaccSel))
{
if (!confProdActive)
{
numPzLasciati = 0;
}
// verifico SE fosse doppia...
bool isMulti = false;
// verifico se la macchina sia configurata tra le MSFD...
@@ -206,8 +223,9 @@ namespace MP_TAB3.Components
// mostro output
lblOut = $"Confermata produzione {numPzConfermati - numPzLasciati} pezzi (+{numPzLasciati} pz lasciati, +{numPzScarto2Rec} pz scarto) |{dtReqUpdate:HH:mm:ss} | {dtReqUpdate:ddd yyyy.MM.dd}";
// cambio button conferma...
showInnov = false;
confProdActive = false;
numPzLasciati = 0;
dtReqUpdate = DateTime.Now;
await DoUpdate();
await Task.Delay(1);
await RefreshData();
@@ -235,7 +253,11 @@ namespace MP_TAB3.Components
/// </summary>
protected async Task ToggleConfProd()
{
showInnov = !showInnov;
confProdActive = !confProdActive;
if (confProdActive)
{
numPzLasc = 0;
}
dtReqUpdate = DateTime.Now;
await DoUpdate();
StateHasChanged();
@@ -245,12 +267,11 @@ namespace MP_TAB3.Components
#region Private Fields
private bool chkPzBuoniNeg = false;
private bool confRett = false;
private bool enablePzProdLasciati = false;
private bool enableMagPrint = false;
private bool chkPzBuoniNeg = false;
private bool enablePzProdLasciati = false;
private string lblOut = "";
private int modoConfProd = 0;
@@ -274,7 +295,7 @@ namespace MP_TAB3.Components
private bool showConfirm { get; set; } = true;
private bool showInnov { get; set; } = false;
private bool confProdActive { get; set; } = false;
#endregion Private Properties
@@ -307,7 +328,5 @@ namespace MP_TAB3.Components
}
#endregion Private Methods
}
}
MP-TAB3/MP-TAB3.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2312.1908</Version>
<Version>6.16.2312.1915</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB3</RootNamespace>
</PropertyGroup>
MP-TAB3/Pages/MachineDetail.razor
-1
View File
@@ -11,5 +11,4 @@ else
<CheckControls RecMSE="CurrMSE"></CheckControls>
<MachineBlock RecMSE="CurrMSE" FullMode="false" IdxMacchSub="@IdxMaccSubSel"></MachineBlock>
<ProdConfirm RecMSE="CurrMSE" E_Updated="RefreshData" E_MachSel="SetMacc"></ProdConfirm>
<ProdStat RecMSE="CurrMSE"></ProdStat>
}
MP-TAB3/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2312.1908</h4>
<h4>Versione: 6.16.2312.1915</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB3/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2312.1908
6.16.2312.1915
MP-TAB3/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2312.1908</version>
<version>6.16.2312.1915</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>