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

Merge branch 'Release/Tab3_FixMachSel_03'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-09-09 17:17:42 +02:00
parent 58bfb72a9f ba0882d4b3
commit 9cef93a3e7
18 changed files with 113 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB3/Components/ProdConfMan.razor.cs
+46 -36
View File
@@ -24,37 +24,6 @@ namespace MP_TAB3.Components
#endregion Public Properties
/// <summary>
/// Init da valori configurazione
/// </summary>
private void InitConfig()
{
TabDServ.ConfigGetVal("TAB_confProdPeriodLastODL", ref ShowLastOdl);
TabDServ.ConfigGetVal("TAB_confProdShowRilav", ref ShowRilav);
TabDServ.ConfigGetVal("TAB_confProdShowArtDescr", ref ShowArtDescr);
TabDServ.ConfigGetVal("TAB_confProdShowExtCode", ref ShowExtCode);
}
/// <summary>
/// Indica se mostrare rilavorati in conferma produzione
/// </summary>
private bool ShowRilav = false;
/// <summary>
/// Indica se partire da ultimo ODL x definire ultimo periodo...
/// </summary>
private bool ShowLastOdl = false;
/// <summary>
/// Indica se mostrare descrizione articolo su 3° riga
/// </summary>
private bool ShowArtDescr = false;
/// <summary>
/// Indica se mostrare CodExt (commessa) su 3° riga
/// </summary>
private bool ShowExtCode = false;
#region Public Methods
public void Dispose()
@@ -137,8 +106,8 @@ namespace MP_TAB3.Components
if (recOdl != null && recOdl.IdxOdl == IdxOdl)
{
DateTime fine = DateTime.Today.AddDays(1);
DateTime inizio = fine.AddMonths(-6);
CurrPeriodo = new Periodo(recOdl.DataInizio ?? inizio.AddMonths(-6), recOdl.DataFine ?? fine);
DateTime inizio = fine.AddMonths(-1);
CurrPeriodo = new Periodo(recOdl.DataInizio ?? inizio.AddDays(-1), recOdl.DataFine ?? fine);
}
}
// altrimenti reset..
@@ -202,6 +171,26 @@ namespace MP_TAB3.Components
private int PageNum = 1;
/// <summary>
/// Indica se mostrare descrizione articolo su 3° riga
/// </summary>
private bool ShowArtDescr = false;
/// <summary>
/// Indica se mostrare CodExt (commessa) su 3° riga
/// </summary>
private bool ShowExtCode = false;
/// <summary>
/// Indica se partire da ultimo ODL x definire ultimo periodo...
/// </summary>
private bool ShowLastOdl = false;
/// <summary>
/// Indica se mostrare rilavorati in conferma produzione
/// </summary>
private bool ShowRilav = false;
private int TotalCount = 0;
private bool useOdl = false;
@@ -283,6 +272,7 @@ namespace MP_TAB3.Components
{
var recOdl = ListaOdl
.Where(x => x.DataInizio <= dtRif && (x.DataFine >= dtRif || x.DataFine == null))
.OrderByDescending(x => x.DataInizio)
.FirstOrDefault();
return recOdl ?? new ODLExpModel();
}
@@ -295,6 +285,17 @@ namespace MP_TAB3.Components
return recOdl ?? new ODLExpModel();
}
/// <summary>
/// Init da valori configurazione
/// </summary>
private void InitConfig()
{
TabDServ.ConfigGetVal("TAB_confProdPeriodLastODL", ref ShowLastOdl);
TabDServ.ConfigGetVal("TAB_confProdShowRilav", ref ShowRilav);
TabDServ.ConfigGetVal("TAB_confProdShowArtDescr", ref ShowArtDescr);
TabDServ.ConfigGetVal("TAB_confProdShowExtCode", ref ShowExtCode);
}
private string OperDto(int matr)
{
string answ = $"[{matr}]";
@@ -333,9 +334,19 @@ namespace MP_TAB3.Components
{
isProcessing = true;
await Task.Delay(1);
DateTime dtEnd = DateTime.Today.AddDays(1);
DateTime dtStart = dtEnd.AddMonths(-3);
if (!string.IsNullOrEmpty(IdxMaccSel))
{
ListaOdl = await TabDServ.OdlListByMaccPeriodo(IdxMaccSel, CurrPeriodo.Inizio.AddMonths(-6), DateTime.Today.AddDays(1));
ListaOdl = await TabDServ.OdlListByMaccPeriodo(IdxMaccSel, dtStart, dtEnd);
// se vuoto prendo 1 anno...
int maxTry = 3;
while (ListaOdl.Count < 1 && maxTry > 0)
{
dtStart = dtStart.AddMonths(-3);
ListaOdl = await TabDServ.OdlListByMaccPeriodo(IdxMaccSel, dtStart, dtEnd);
maxTry--;
}
ListComplete = await TabDServ.ElencoConfProdFiltAsync(IdxMaccSel, CurrPeriodo.Inizio, CurrPeriodo.Fine);
TotalCount = ListComplete.Count;
// esegue paginazione
@@ -368,12 +379,11 @@ namespace MP_TAB3.Components
if (doSet)
{
DateTime fine = DateTime.Today.AddDays(1);
DateTime inizio = fine.AddMonths(-6);
DateTime inizio = fine.AddMonths(-1);
CurrPeriodo = new Periodo(inizio, fine);
}
}
#endregion Private Methods
}
}
MP-TAB3/Components/ProdPlanMan.razor
+7 -3
View File
@@ -1,16 +1,20 @@
<div class="row mt-2">
<div class="col-6">
<div class="d-flex justify-content-between mt-2">
<div class="px-2 flex-grow-1">
<h4>Piano Produzione - PODL</h4>
<MachSel RecMSE="RecMSE" E_MachSel="SetMacc"></MachSel>
</div>
<div class="col-6">
<div class="px-2">
<h4>&nbsp;</h4>
<div class="form-check form-switch fs-6">
<input class="form-check-input" type="checkbox" @bind="@OnlyDirect">
<label class="form-check-label">Solo Assegnazione Diretta</label>
</div>
</div>
</div>
<div>
<ShowProcessing Message="Caricamento" IsProcessing="@isProcessing"></ShowProcessing>
</div>
@if (isProcessing)
{
<EgwCoreLib.Razor.LoadingData></EgwCoreLib.Razor.LoadingData>
MP-TAB3/Components/ProdPlanMan.razor.cs
+9 -2
View File
@@ -11,6 +11,12 @@ namespace MP_TAB3.Components
[Parameter]
public MappaStatoExplModel? RecMSE { get; set; } = null;
[Parameter]
public string IdxMacchSub { get; set; } = "";
[Parameter]
public EventCallback<string> E_MachSel { get; set; }
#endregion Public Properties
#region Public Methods
@@ -76,11 +82,12 @@ namespace MP_TAB3.Components
protected async Task SetMacc(string selIdxMacc)
{
isProcessing = true;
await Task.Delay(10);
await Task.Delay(1);
IdxMaccSel = selIdxMacc;
await Task.Delay(1);
await doUpdate();
isProcessing = false;
await Task.Delay(10);
await E_MachSel.InvokeAsync(selIdxMacc);
}
protected string TCMinSec(object _TC)
MP-TAB3/Components/ScrapMan.razor.cs
+3 -1
View File
@@ -13,6 +13,9 @@ namespace MP_TAB3.Components
[Parameter]
public EventCallback<string> E_MachSel { get; set; }
[Parameter]
public string IdxMacchSub { get; set; } = "";
[Parameter]
public MappaStatoExplModel? RecMSE { get; set; } = null;
@@ -115,7 +118,6 @@ namespace MP_TAB3.Components
IdxMaccSel = selIdxMacc;
await ReloadData();
isProcessing = false;
await Task.Delay(1);
await E_MachSel.InvokeAsync(selIdxMacc);
}
MP-TAB3/MP-TAB3.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2509.912</Version>
<Version>6.16.2509.917</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB3</RootNamespace>
</PropertyGroup>
MP-TAB3/Pages/BasePage.razor.cs
+22
View File
@@ -42,6 +42,15 @@ namespace MP_TAB3.Pages
#endregion Public Methods
#region Protected Fields
/// <summary>
/// IdxMacchinaSub (tavola)
/// </summary>
protected string IdxMaccSubSel = "";
#endregion Protected Fields
#region Protected Properties
/// <summary>
@@ -135,6 +144,19 @@ namespace MP_TAB3.Pages
}
}
/// <summary>
/// Selezione macchina SUB
/// </summary>
/// <param name="selIdxMacc"></param>
protected void SetMacc(string selIdxMacc)
{
IdxMaccSubSel = selIdxMacc;
}
/// <summary>
/// Variabile caricamento
/// </summary>
protected bool IsLoading = false;
#endregion Protected Methods
#region Private Fields
MP-TAB3/Pages/Controls.razor.cs
-13
View File
@@ -17,19 +17,6 @@ namespace MP_TAB3.Pages
await ReloadData();
}
protected void SetMacc(string selIdxMacc)
{
IdxMaccSubSel = selIdxMacc;
}
#endregion Protected Methods
#region Private Fields
private string IdxMaccSubSel = "";
private bool IsLoading = false;
#endregion Private Fields
}
}
MP-TAB3/Pages/MachineDetail.razor.cs
+3 -9
View File
@@ -8,8 +8,10 @@ namespace MP_TAB3.Pages
{
#region Protected Properties
#if false
[Inject]
protected TabDataService TabServ { get; set; } = null!;
protected TabDataService TabServ { get; set; } = null!;
#endif
#endregion Protected Properties
@@ -26,11 +28,6 @@ namespace MP_TAB3.Pages
}
}
protected void SetMacc(string selIdxMacc)
{
IdxMaccSubSel = selIdxMacc;
}
#endregion Protected Methods
#region Private Fields
@@ -38,7 +35,6 @@ namespace MP_TAB3.Pages
private static Logger Log = LogManager.GetCurrentClassLogger();
private bool enableMagLotti = false;
private bool enableSchedaTecnica = false;
private string IdxMaccSubSel = "";
private DateTime lastSave = DateTime.Now;
#endregion Private Fields
@@ -69,8 +65,6 @@ namespace MP_TAB3.Pages
#endif
}
private async Task setupConf()
{
enableSchedaTecnica = MStor.GetConfBool("enableSchedaTecnica");
MP-TAB3/Pages/ODL.razor.cs
-11
View File
@@ -9,17 +9,6 @@ namespace MP_TAB3.Pages
await base.OnInitializedAsync();
}
protected void SetMacc(string selIdxMacc)
{
IdxMaccSubSel = selIdxMacc;
}
#endregion Protected Methods
#region Private Fields
private string IdxMaccSubSel = "";
#endregion Private Fields
}
}
MP-TAB3/Pages/ProdConf.razor
+1 -1
View File
@@ -10,5 +10,5 @@ else
{
<CheckControls RecMSE="CurrMSE"></CheckControls>
<MachineBlock RecMSE="CurrMSE" FullMode="false" IdxMacchSub="@IdxMaccSubSel"></MachineBlock>
<ProdConfMan RecMSE="CurrMSE" IdxMacchSub="@IdxMaccSubSel"></ProdConfMan>
<ProdConfMan RecMSE="CurrMSE" IdxMacchSub="@IdxMaccSubSel" E_MachSel="SetMacc"></ProdConfMan>
}
MP-TAB3/Pages/ProdConf.razor.cs
+1 -19
View File
@@ -1,7 +1,3 @@
using Microsoft.AspNetCore.Components;
using MP.Data.Services;
namespace MP_TAB3.Pages
{
public partial class ProdConf
@@ -11,7 +7,7 @@ namespace MP_TAB3.Pages
protected async Task ForceReload()
{
IsLoading = true;
await Task.Delay(5);
await Task.Delay(10);
IsLoading = false;
}
@@ -21,20 +17,6 @@ namespace MP_TAB3.Pages
await ReloadData();
}
protected void SetMacc(string selIdxMacc)
{
IdxMaccSubSel = selIdxMacc;
}
#endregion Protected Methods
#region Private Fields
private string IdxMaccSubSel = "";
private bool IsLoading = false;
#endregion Private Fields
}
}
MP-TAB3/Pages/ProdPlan.razor
+2 -2
View File
@@ -8,6 +8,6 @@
else
{
<CheckControls RecMSE="CurrMSE"></CheckControls>
<MachineBlock RecMSE="CurrMSE" FullMode="false"></MachineBlock>
<ProdPlanMan RecMSE="CurrMSE"></ProdPlanMan>
<MachineBlock RecMSE="CurrMSE" FullMode="false" IdxMacchSub="@IdxMaccSubSel"></MachineBlock>
<ProdPlanMan RecMSE="CurrMSE" IdxMacchSub="@IdxMaccSubSel" E_MachSel="SetMacc"></ProdPlanMan>
}
MP-TAB3/Pages/ProdPlan.razor.cs
+7
View File
@@ -4,6 +4,13 @@ namespace MP_TAB3.Pages
{
#region Protected Methods
protected async Task ForceReload()
{
IsLoading = true;
await Task.Delay(10);
IsLoading = false;
}
protected override async Task OnInitializedAsync()
{
await base.OnInitializedAsync();
MP-TAB3/Pages/Scrap.razor
+1 -1
View File
@@ -9,5 +9,5 @@ else
{
<CheckControls RecMSE="CurrMSE"></CheckControls>
<MachineBlock RecMSE="CurrMSE" FullMode="false" IdxMacchSub="@IdxMaccSubSel"></MachineBlock>
<ScrapMan RecMSE="CurrMSE" E_MachSel="SetMacc"></ScrapMan>
<ScrapMan RecMSE="CurrMSE" IdxMacchSub="@IdxMaccSubSel" E_MachSel="SetMacc"></ScrapMan>
}
MP-TAB3/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2509.912</h4>
<h4>Versione: 6.16.2509.917</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB3/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2509.912
6.16.2509.917
MP-TAB3/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2509.912</version>
<version>6.16.2509.917</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-TAB3/appsettings.json
+7
View File
@@ -8,6 +8,13 @@
"AllowedHosts": "*",
"CodApp": "MP.TAB",
"ConnectionStrings": {
//"Redis": "redis.ufficio:26379,serviceName=devel,DefaultDatabase=6,connectTimeout=15000,syncTimeout=15000,asyncTimeout=15000,abortConnect=false,ssl=false,allowAdmin=true",
//"MP.All": "Server=SQL2022PROD;Database=Donati_LAV_MoonPro_prod; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=MP.TAB3;",
//"MP.Mon": "Server=SQL2022PROD;Database=Donati_LAV_MoonPro_prod; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=MP.TAB3;",
//"MP.IS": "Server=SQL2022PROD;Database=MoonPro_IS_EdilChim; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=MP.INVE;",
//"MP.Tab": "Server=SQL2022PROD;Database=Donati_LAV_MoonPro_prod; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=MP.TAB3;",
//"MP.Mag": "Server=SQL2022PROD;Database=MoonPro_MAG; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=MP.TAB3;"
"Redis": "redis.ufficio:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=15000,syncTimeout=15000,asyncTimeout=15000,abortConnect=false,ssl=false,allowAdmin=true",
"MP.All": "Server=SQL2016DEV;Database=MoonPro; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=MP.TAB3;",
"MP.Mon": "Server=SQL2016DEV;Database=MoonPro; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=MP.TAB3;",