diff --git a/MP.Data/Controllers/MpMonController.cs b/MP.Data/Controllers/MpMonController.cs index 512fb20e..9b8cf124 100644 --- a/MP.Data/Controllers/MpMonController.cs +++ b/MP.Data/Controllers/MpMonController.cs @@ -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; } diff --git a/MP.Data/DatabaseModels/Macchine.cs b/MP.Data/DatabaseModels/Macchine.cs index 5cd3c9ac..757a70f3 100644 --- a/MP.Data/DatabaseModels/Macchine.cs +++ b/MP.Data/DatabaseModels/Macchine.cs @@ -38,6 +38,11 @@ namespace MP.Data.DatabaseModels /// public string RecipeArchivePath { get; set; } = ""; + /// + /// Locazione (x ordinamento) + /// + public string locazione { get; set; } = ""; + /// /// Indica se abbia ricetta calcolata /// @@ -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; diff --git a/MP.Data/Objects/Enums.cs b/MP.Data/Objects/Enums.cs index 7e9428af..16387c80 100644 --- a/MP.Data/Objects/Enums.cs +++ b/MP.Data/Objects/Enums.cs @@ -280,11 +280,21 @@ namespace MP.Data.Objects /// setArt, + /// + /// Imposta Articolo IN MODALITA' NUMERICA su PLC + /// + setArtNum, + /// /// Imposta Commessa su PLC /// setComm, + /// + /// Imposta Commessa IN MODALITA' NUMERICA su PLC + /// + setCommNum, + /// /// Set di un PARAMETRO su PLC (in value avremo un JSON object) /// diff --git a/MP.Mon/MP.Mon.csproj b/MP.Mon/MP.Mon.csproj index 994932ab..3f659728 100644 --- a/MP.Mon/MP.Mon.csproj +++ b/MP.Mon/MP.Mon.csproj @@ -4,7 +4,7 @@ net6.0 enable enable - 6.16.2411.408 + 6.16.2411.1209 diff --git a/MP.Mon/Resources/ChangeLog.html b/MP.Mon/Resources/ChangeLog.html index 9e554f04..8c06e1df 100644 --- a/MP.Mon/Resources/ChangeLog.html +++ b/MP.Mon/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MON MAPO -

Versione: 6.16.2411.408

+

Versione: 6.16.2411.1209


Note di rilascio: