Modifica interfaccia stima tempi
This commit is contained in:
Annamaria Sassi
@@ -156,7 +156,7 @@
|
||||
else
|
||||
{
|
||||
if (LoadDetail != null && LoadDetail.Count > 0)
|
||||
ans = LoadDetail.Max(x => x.MaxTime);
|
||||
ans = LoadDetail.Sum(x => x.MaxTime);
|
||||
else
|
||||
ans = 0;
|
||||
}
|
||||
|
||||
@@ -76,7 +76,7 @@ namespace EgwCoreLib.Lux.Data.DbModel.Production
|
||||
/// Num parts complessivamente incluse
|
||||
/// </summary>
|
||||
[NotMapped]
|
||||
public int NumParts => WorkGroupList?.Sum(x => x.Value.NumParts) ?? 0;
|
||||
public int NumParts => WorkGroupList?.Max(x => x.Value.NumParts) ?? 0;
|
||||
|
||||
/// <summary>
|
||||
/// Tempo stimato complessivo
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Version>1.1.2606.2517</Version>
|
||||
<Version>1.1.2606.2614</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -114,8 +114,147 @@
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<div class="row gap-2">
|
||||
<div class="col-12">
|
||||
@if (DetailRecord.NumKo > 0)
|
||||
{
|
||||
<div class="card">
|
||||
<div class="card-header d-flex align-items-center justify-content-between">
|
||||
<div class="col-9">Non producibili: <span class="fw-bold px-1">@DetailRecord.NumKo</span></div>
|
||||
<div class="col-3">
|
||||
<button class="btn btn-sm btn-danger w-100" @onclick="() => ToggleAssignMode(DetailRecord.ListWorkable, SetMode.AssignUnwork)" title="Assegna per Esclusione / Manuale / Esterno">Escludi <i class="fa-solid fa-triangle-exclamation"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
@if (DetailRecord.NumOkVin > 0)
|
||||
{
|
||||
<div class="card mb-2">
|
||||
<div class="card-header align-items-center justify-content-between">
|
||||
<div class="row">
|
||||
<div class="col-9">Vincolati: <span class="fw-bold px-1">@DetailRecord.NumOkVin</span></div>
|
||||
<div class="col-3">
|
||||
<button class="btn btn-sm btn-info w-100" @onclick="() => ToggleAssignMode(DetailRecord.ListWorkable, SetMode.AssignOk)">Assegna <i class="fa-solid fa-thumbtack"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<table class="table table-sm table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="col-1">
|
||||
<button class="btn btn-sm btn-success" @onclick="() => ToggleAssignMode(DetailRecord.ListWorkable, SetMode.None)"><i class="fa-solid fa-rotate-right"></i></button>
|
||||
</th>
|
||||
<th class="col-6">
|
||||
Impianti
|
||||
</th>
|
||||
<th class="col-2 text-end">
|
||||
# Parts
|
||||
</th>
|
||||
<th class="col-3 text-end">
|
||||
Time
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@if (AllProdGroup != null && AllProdGroup.Count > 0)
|
||||
{
|
||||
@foreach (var item in AllProdGroup.Where(x => x.NumParts == DetailRecord.NumOkVin))
|
||||
{
|
||||
<tr>
|
||||
<td>
|
||||
<button class="btn btn-sm btn-danger" @onclick="() => SendUnworkExt(item.ProdGroupID)" title="Escludi in blocco"><i class="fa-solid fa-arrow-right-from-bracket"></i> <i class="fa-solid fa-triangle-exclamation"></i></button>
|
||||
</td>
|
||||
<td>
|
||||
@item.PlantListJoin
|
||||
</td>
|
||||
<td class="text-end">
|
||||
@NumParts(item)
|
||||
</td>
|
||||
<td class="text-end">
|
||||
@DisplayDurata(item)
|
||||
</td>
|
||||
</tr>
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
<tr>
|
||||
<td colspan="4" class="alert alert-warning">Nessun record trovato!</td>
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
@if (DetailRecord.NumOk > 0)
|
||||
{
|
||||
<div class="card">
|
||||
<div class="card-header d-flex align-items-center justify-content-between">
|
||||
<div class="col-9">Producibili ovunque: <span class="fw-bold px-1">@DetailRecord.NumOk</span></div>
|
||||
<div class="col-3">
|
||||
<button class="btn btn-sm btn-success w-100" @onclick="() => ToggleAssignMode(DetailRecord.ListWorkable, SetMode.Balance)">Bilancia <i class="fa-solid fa-scale-unbalanced"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<table class="table table-sm table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="col-1">
|
||||
<button class="btn btn-sm btn-success" @onclick="() => ToggleAssignMode(DetailRecord.ListWorkable, SetMode.None)"><i class="fa-solid fa-rotate-right"></i></button>
|
||||
</th>
|
||||
<th class="col-6">
|
||||
Impianti
|
||||
</th>
|
||||
<th class="col-2 text-end">
|
||||
# Parts
|
||||
</th>
|
||||
<th class="col-3 text-end">
|
||||
Time
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@if (AllProdGroup != null && AllProdGroup.Count > 0)
|
||||
{
|
||||
@foreach (var item in AllProdGroup.Where(x => x.NumParts == DetailRecord.NumOk))
|
||||
{
|
||||
<tr>
|
||||
<td>
|
||||
<button class="btn btn-sm btn-danger" @onclick="() => SendUnworkExt(item.ProdGroupID)" title="Escludi in blocco"><i class="fa-solid fa-arrow-right-from-bracket"></i> <i class="fa-solid fa-triangle-exclamation"></i></button>
|
||||
</td>
|
||||
<td>
|
||||
@item.PlantListJoin
|
||||
</td>
|
||||
<td class="text-end">
|
||||
@NumParts(item)
|
||||
</td>
|
||||
<td class="text-end">
|
||||
@DisplayDurata(item)
|
||||
</td>
|
||||
</tr>
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
<tr>
|
||||
<td colspan="4" class="alert alert-warning">Nessun record trovato!</td>
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row justify-content-end">
|
||||
<div>
|
||||
<button class="btn btn-warning" @onclick="ForceResetAssign">Reset Assegnazioni</button>
|
||||
</div>
|
||||
</div>
|
||||
@* <div class="col-6">
|
||||
<ul class="list-group">
|
||||
@if (DetailRecord.NumKo > 0)
|
||||
{
|
||||
@@ -188,29 +327,20 @@
|
||||
</td>
|
||||
</tr>
|
||||
}
|
||||
} *@
|
||||
}
|
||||
@if (AllProdGroup != null && AllProdGroup.Count > 0)
|
||||
{
|
||||
@foreach (var item in AllProdGroup)
|
||||
{
|
||||
<tr>
|
||||
<td>
|
||||
@* @if (CurrMode == SetMode.AssignUnwork && item.ProdPlantCod.Contains("EXT"))
|
||||
{
|
||||
<button class="btn btn-sm btn-danger" @onclick="() => SendUnworkExt(item.ProdAssignID)" title="Escludi in blocco"><i class="fa-solid fa-arrow-right-from-bracket"></i> <i class="fa-solid fa-triangle-exclamation"></i></button>
|
||||
} *@
|
||||
<button class="btn btn-sm btn-danger" @onclick="() => SendUnworkExt(item.ProdGroupID)" title="Escludi in blocco"><i class="fa-solid fa-arrow-right-from-bracket"></i> <i class="fa-solid fa-triangle-exclamation"></i></button>
|
||||
</td>
|
||||
<td>
|
||||
@item.PlantListJoin
|
||||
</td>
|
||||
<td class="text-end">
|
||||
@NumParts(item)
|
||||
@* @item.NumParts / @($"{NumPartRatio(item.NumParts):P1}") *@
|
||||
</td>
|
||||
<td class="text-end">
|
||||
@DisplayDurata(item)
|
||||
@* @DisplayDurata(item) / @($"{TotMaxTimeRatio(item.TotalEstimTime):P1}") *@
|
||||
</td>
|
||||
</tr>
|
||||
}
|
||||
@@ -230,8 +360,8 @@
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div> *@
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<UserSecretsId>aspnet-Lux.UI-a758c101-a2f4-4e38-977d-1c4887dbbd50</UserSecretsId>
|
||||
<Version>1.1.2606.2517</Version>
|
||||
<Version>1.1.2606.2614</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<body>
|
||||
<i>LUX - Web Windows MES</i>
|
||||
<h4>Versione: 1.1.2606.2517</h4>
|
||||
<h4>Versione: 1.1.2606.2614</h4>
|
||||
<br /> Note di rilascio:
|
||||
<ul>
|
||||
<li>
|
||||
|
||||
@@ -1 +1 @@
|
||||
1.1.2606.2517
|
||||
1.1.2606.2614
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<item>
|
||||
<version>1.1.2606.2517</version>
|
||||
<version>1.1.2606.2614</version>
|
||||
<url>http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip</url>
|
||||
<changelog>http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html</changelog>
|
||||
<mandatory>false</mandatory>
|
||||
|
||||
Reference in New Issue
Block a user