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

Merge branch 'Release/Tab3_FixScartoPostSetup01'

Browse Source
This commit is contained in:
Samuele Locatelli
2024-11-14 16:08:20 +01:00
parent f9881673b1 9eb3ef6645
commit 4401907b10
17 changed files with 73 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB3/Components/MachineBlock.razor
+1 -1
View File
@@ -200,7 +200,7 @@ else
{
<div class="text-end text-danger d-flex justify-content-between">
<div class="px-0">
Scarto
Scarto Conf
</div>
<div class="px-0">
@($"- {datiProdAct.PzConfScarto}")
MP-TAB3/Components/MachineBlock.razor.cs
+2 -2
View File
@@ -199,7 +199,7 @@ namespace MP_TAB3.Components
}
/// <summary>
/// Dati produzioen rilevati
/// Dati produzione rilevati
/// </summary>
protected StatoProdModel? datiProdAct { get; set; } = null;
@@ -258,7 +258,7 @@ namespace MP_TAB3.Components
// controllo SE ho variazioni così rileggo
if (RecMSE != null)
{
if (SDService.MachNumPzGet(RecMSE.IdxMacchina) != RecMSE.PezziProd)
if (SDService.MachNumPzGet(RecMSE.IdxMacchina) != RecMSE.PezziProd || SDService.MachProdStGet(RecMSE.IdxMacchina).IdxOdl != RecMSE.IdxOdl)
{
datiProdAct = await TabDServ.StatoProdMacchina(RecMSE.IdxMacchina, adesso);
SDService.MachProdStSet(RecMSE.IdxMacchina, datiProdAct);
MP-TAB3/Components/OdlMan.razor.cs
+14
View File
@@ -429,6 +429,10 @@ namespace MP_TAB3.Components
if (!await JSRuntime.InvokeAsync<bool>("confirm", $"PODL: {currPodl.IdxPromessa}{Environment.NewLine}Art: [{currPodl.CodArticolo}] {currPodl.DescArticolo}{Environment.NewLine}Pezzi: {currPodl.NumPezzi} * TCiclo: {tcRichAttr:N3}min{Environment.NewLine}Tempo stimato: {stima}{Environment.NewLine}{Environment.NewLine}Confermi la chiusura della fase di attrezzaggio?"))
return;
// prima di tutto svuoto dati prod
SDService.MachProdStRem(IdxMaccSel);
// preparo gestione progress display
MaxVal = 8;
int currStep = 0;
@@ -547,6 +551,9 @@ namespace MP_TAB3.Components
// preparo gestione progress display
MaxVal = 11;
int currStep = 0;
// elimino dati status...
SDService.MachProdStRem(IdxMaccSel);
SDService.MachProdStRem(IdxMaccParent);
if (isMulti)
{
@@ -811,6 +818,7 @@ namespace MP_TAB3.Components
await advStep(currStep);
// leggo idxOdl da ultimo odl attivo x macchina
var currOdl = await TabDServ.OdlCurrByMacc(IdxMaccSel, false);
SDService.MachProdStRem(IdxMaccSel);
int idxODLCurr = currOdl.IdxOdl;
int idxEvento = 7;
// !!!HARD CODED confermo prod vecchio ODL
@@ -980,6 +988,9 @@ namespace MP_TAB3.Components
if (!await JSRuntime.InvokeAsync<bool>("confirm", $"Confermi invio FIX chiusura attrezzaggio ad impianto?"))
return;
// prima di tutto svuoto dati prod
SDService.MachProdStRem(IdxMaccSel);
string ts = string.Format("{0:yyMMdd}T{0:HHmmss.fff}Z", DateTime.Now);
string outData = $"TS:{ts}|MATR:{MatrOpr}|ODL:{IdxOdl}";
TabDServ.addTask4Machine(IdxMaccSel, taskType.fixStopSetup, outData);
@@ -1062,6 +1073,9 @@ namespace MP_TAB3.Components
if (!await JSRuntime.InvokeAsync<bool>("confirm", $"Confermi richiesta riattrezzaggio ODL, con conseguente chiusura ODL corrente + split nuovo ODL con TC {tcRichAttr:N3}?"))
return;
// prima di tutto svuoto dati prod
SDService.MachProdStRem(IdxMaccSel);
// preparo gestione progress display
MaxVal = 9;
int currStep = 0;
MP-TAB3/Components/ParamsMan.razor
+23 -11
View File
@@ -71,12 +71,24 @@
</div>
</div>
</div>
<div class="row" runat="server" id="divRequest" visible='<%# !string.IsNullOrEmpty(Eval("reqValue").ToString()) %>'>
<div class="row">
<div class="col-12">
<div class="fw-bold text-primary small text-nowrap">
<i class="fa fa-hand-o-right" aria-hidden="true"></i>
@item.reqValue
</div>
@if (!string.IsNullOrEmpty(item.reqValue))
{
<div class="fw-bold text-primary small text-nowrap">
<i class="fa-solid fa-angles-right"></i>
@item.reqValue
</div>
}
else
{
if (!string.IsNullOrEmpty(item.value))
{
<div class="fw-bold text-success small text-nowrap">
<i class="fa-solid fa-circle-check small"></i>
</div>
}
}
</div>
</div>
</td>
@@ -114,12 +126,12 @@
{
@if (isSelected(item.uid))
{
@* <div class="col-12">
<div class="input-group">
<button class="btn btn-success" @onclick="() => DoSave()"><i class="fa-solid fa-check"></i></button>
<button class="btn btn-danger" @onclick="() => ResetReq()"><i class="fa-solid fa-ban"></i></button>
</div>
</div> *@
@* <div class="col-12">
<div class="input-group">
<button class="btn btn-success" @onclick="() => DoSave()"><i class="fa-solid fa-check"></i></button>
<button class="btn btn-danger" @onclick="() => ResetReq()"><i class="fa-solid fa-ban"></i></button>
</div>
</div> *@
}
else
{
MP-TAB3/Components/ScrapEditor.razor.cs
+5
View File
@@ -52,6 +52,9 @@ namespace MP_TAB3.Components
}
}
[Inject]
protected StatusData SDService { get; set; } = null!;
[Inject]
protected SharedMemService SMServ { get; set; } = null!;
@@ -105,6 +108,8 @@ namespace MP_TAB3.Components
{
// reset
DoReset();
// prima di tutto svuoto dati prod
SDService.MachProdStRem(IdxMaccSel);
errMsg = "";
await E_Updated.InvokeAsync(true);
await ReloadData();
MP-TAB3/MP-TAB3.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2411.607</Version>
<Version>6.16.2411.1415</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.2411.607</h4>
<h4>Versione: 6.16.2411.1415</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB3/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2411.607
6.16.2411.1415
MP-TAB3/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2411.607</version>
<version>6.16.2411.1415</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/Controllers/MpMonController.cs
+4
View File
@@ -125,6 +125,10 @@ namespace MP.Data.Controllers
{
Log.Error($"Eccezione in MacchineGetFilt{Environment.NewLine}{exc}");
}
// update: ordinamento x Locazione
dbResult = dbResult
.Where(x => !string.IsNullOrEmpty(x.locazione))
.OrderBy(x => x.locazione).ToList();
return dbResult;
}
MP.Data/DatabaseModels/Macchine.cs
+5 -1
View File
@@ -38,6 +38,11 @@ namespace MP.Data.DatabaseModels
/// </summary>
public string RecipeArchivePath { get; set; } = "";
/// <summary>
/// Locazione (x ordinamento)
/// </summary>
public string locazione { get; set; } = "";
/// <summary>
/// Indica se abbia ricetta calcolata
/// </summary>
@@ -57,7 +62,6 @@ namespace MP.Data.DatabaseModels
//public string Note { get; set; } = "";
//public string url { get; set; } = "";
//public string locazione { get; set; } = "";
//public string css { get; set; } = "";
//public int RowNum { get; set; } = 0;
//public int ColNum { get; set; } = 0;
MP.Data/Objects/Enums.cs
+10
View File
@@ -280,11 +280,21 @@ namespace MP.Data.Objects
/// </summary>
setArt,
/// <summary>
/// Imposta Articolo IN MODALITA' NUMERICA su PLC
/// </summary>
setArtNum,
/// <summary>
/// Imposta Commessa su PLC
/// </summary>
setComm,
/// <summary>
/// Imposta Commessa IN MODALITA' NUMERICA su PLC
/// </summary>
setCommNum,
/// <summary>
/// Set di un PARAMETRO su PLC (in value avremo un JSON object)
/// </summary>
MP.Data/Services/StatusData.cs
+1 -1
View File
@@ -213,7 +213,7 @@ namespace MP.Data.Services
}
/// <summary>
/// Restituisce numPezzi (ultimo) x macchina
/// Restituisce stato prod x NumPezzi (ultimo) x macchina
/// </summary>
/// <param name="idxMacchina"></param>
/// <returns></returns>
MP.Mon/MP.Mon.csproj
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>6.16.2411.408</Version>
<Version>6.16.2411.1209</Version>
</PropertyGroup>
<ItemGroup>
MP.Mon/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MON MAPO</i>
<h4>Versione: 6.16.2411.408</h4>
<h4>Versione: 6.16.2411.1209</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.Mon/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2411.408
6.16.2411.1209
MP.Mon/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2411.408</version>
<version>6.16.2411.1209</version>
<url>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP.Mon.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>