diff --git a/MP-TAB3/Components/AlarmsMan.razor b/MP-TAB3/Components/AlarmsMan.razor index 71c0d8ef..1c0530a8 100644 --- a/MP-TAB3/Components/AlarmsMan.razor +++ b/MP-TAB3/Components/AlarmsMan.razor @@ -65,7 +65,13 @@ else } + + + + + + + - } \ No newline at end of file diff --git a/MP-TAB3/Components/ControlsMan.razor b/MP-TAB3/Components/ControlsMan.razor index 1ce73d7b..344b70d0 100644 --- a/MP-TAB3/Components/ControlsMan.razor +++ b/MP-TAB3/Components/ControlsMan.razor @@ -123,11 +123,15 @@ } + + + + + + + - \ No newline at end of file diff --git a/MP-TAB3/Components/DeclarMan.razor b/MP-TAB3/Components/DeclarMan.razor index cadac2f2..ac0cb7e6 100644 --- a/MP-TAB3/Components/DeclarMan.razor +++ b/MP-TAB3/Components/DeclarMan.razor @@ -44,7 +44,7 @@ { - + @@ -64,11 +64,15 @@ } + + + + + + + -
- -
\ No newline at end of file diff --git a/MP-TAB3/Components/ProdConfMan.razor b/MP-TAB3/Components/ProdConfMan.razor index 422f1fc0..a93678d9 100644 --- a/MP-TAB3/Components/ProdConfMan.razor +++ b/MP-TAB3/Components/ProdConfMan.razor @@ -27,7 +27,7 @@
- + @*
@@ -67,11 +67,60 @@ } +
DataOra
*@ + + + + + + + @if (ShowRilav) + { + + } + + + + + @foreach (var item in ListPaged) + { + var actOdl = ActiveOdl(item.DataTo); + + + + @* *@ + + + @if (ShowRilav) + { + + } + + + } + + + + + +
Art/ODL# Pz Conf# Pz Scarto# Pz RilavOperatore
+
+ Art: @actOdl.CodArticolo +
+
+ ODL: @($"ODL{actOdl.IdxOdl:000000000}") +
+
+
@($"ODL{actOdl.IdxOdl:00000000}")
+
@item.CommessaEsterna
+
@item.PezziConf@item.PezziScar@item.PezziDaRilav +
@($"{item.DataOraConf:ddd yyyy-MM-dd HH:mm:ss}")
+
@OperDto(item.MatrApp)
+
+ +
- diff --git a/MP-TAB3/Components/ProdConfMan.razor.cs b/MP-TAB3/Components/ProdConfMan.razor.cs index e0b900cd..932688c6 100644 --- a/MP-TAB3/Components/ProdConfMan.razor.cs +++ b/MP-TAB3/Components/ProdConfMan.razor.cs @@ -264,6 +264,28 @@ namespace MP_TAB3.Components return recOdl ?? new ODLModel(); } + private string 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}"; + } + DictOpr.Add(matr, answ); + } + return answ; + } + +#if false private MarkupString OperDto(int matr) { string answ = $"[{matr}]"; @@ -278,12 +300,13 @@ namespace MP_TAB3.Components var recOpr = ListaOper.Where(x => x.MatrOpr == matr).FirstOrDefault(); if (recOpr != null) { - answ = $"{recOpr.Cognome} {recOpr.Nome}
[{matr}]"; + answ = $"{recOpr.Cognome} {recOpr.Nome}{matr}"; } DictOpr.Add(matr, answ); } return (MarkupString)answ; - } + } +#endif /// /// Rileggo anagrafiche di base diff --git a/MP-TAB3/Components/ScrapMan.razor b/MP-TAB3/Components/ScrapMan.razor index 34e19143..bbe37d17 100644 --- a/MP-TAB3/Components/ScrapMan.razor +++ b/MP-TAB3/Components/ScrapMan.razor @@ -84,13 +84,13 @@ × @if (item.KitSplit) { - } else { - } @@ -136,11 +136,15 @@ } } + + + + + + + -
- -
\ No newline at end of file diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index a464479e..6da0ba3a 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2507.2410 + 6.16.2507.2417 enable MP_TAB3 diff --git a/MP-TAB3/Pages/ProdConf.razor b/MP-TAB3/Pages/ProdConf.razor index 5a77509a..f47ecf41 100644 --- a/MP-TAB3/Pages/ProdConf.razor +++ b/MP-TAB3/Pages/ProdConf.razor @@ -12,5 +12,3 @@ else } - - diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index d6dc4379..b4229754 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2507.2410

+

Versione: 6.16.2507.2417


Note di rilascio: