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

Update modelli con ricette

Browse Source
This commit is contained in:
Samuele Locatelli
2023-03-31 17:45:37 +02:00
parent ef3393e6e6
commit e164f617e7
9 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.Data/Controllers/MpSpecController.cs
+1 -1
View File
@@ -366,8 +366,8 @@ namespace MP.Data.Controllers
.AsNoTracking()
.Where(x => (IdxMacchina == "*" || x.IdxMacchina == IdxMacchina) && (CodArticolo == "*" || x.CodArticolo == CodArticolo) && (x.DtRif >= DtStart && x.DtRif <= DtEnd))
.Include(m => m.MachineNav)
//.Include(o => o.OdlNav)
.Include(a => a.ArticoloNav)
////.Include(o => o.OdlNav)
.OrderByDescending(x => x.DtRif)
.ToList();
}
MP.Data/DatabaseModels/Macchine.cs
+33
View File
@@ -17,10 +17,43 @@ namespace MP.Data.DatabaseModels
[Key]
public string IdxMacchina { get; set; }
/// <summary>
/// Cod macchina
/// </summary>
public string CodMacchina { get; set; } = "";
/// <summary>
/// Nome macchina
/// </summary>
public string Nome { get; set; } = "";
/// <summary>
/// Descrizione macchina
/// </summary>
public string Descrizione { get; set; } = "";
/// <summary>
/// Patch del file json di configurazione di una ricetta
/// </summary>
public string RecipePath { get; set; } = "";
/// <summary>
/// Path (assoluto!) dell'archivio ricette da impiegare
/// </summary>
public string RecipeArchivePath { get; set; } = "";
/// <summary>
/// Indica se abbia ricetta calcolata
/// </summary>
[NotMapped]
public bool hasRecipeCalc
{
get => !string.IsNullOrEmpty(RecipePath);
}
/// <summary>
/// Indica se abbia ricetta calcolata
/// </summary>
[NotMapped]
public bool hasRecipeArch
{
get => !string.IsNullOrEmpty(RecipeArchivePath);
}
//public string Note { get; set; } = "";
//public string url { get; set; } = "";
MP.Data/DatabaseModels/PODLExpModel.cs
+2
View File
@@ -38,6 +38,8 @@ namespace MP.Data.DatabaseModels
[MaxLength(50)]
public string CodCli { get; set; } = "";
public DateTime InsertDate { get; set; } = DateTime.Now;
[MaxLength(500)]
public string Recipe { get; set; } = "";
[NotMapped]
public string CodFase
MP.Data/DatabaseModels/PODLModel.cs
+2
View File
@@ -39,6 +39,8 @@ namespace MP.Data.DatabaseModels
[MaxLength(50)]
public string CodCli { get; set; } = "";
public DateTime InsertDate { get; set; } = DateTime.Now;
[MaxLength(500)]
public string Recipe { get; set; } = "";
[NotMapped]
public string CodFase
MP.SPEC/Components/ListDossiers.razor.cs
+6 -6
View File
@@ -153,7 +153,7 @@ namespace MP.SPEC.Components
await Task.Delay(1);
var done = await MDService.DossiersDeleteRecord(selRec);
currRecord = null;
await reloadData(true);
await ReloadData(true);
visualizzaFlux = true;
await Task.Delay(1);
}
@@ -206,7 +206,7 @@ namespace MP.SPEC.Components
currRecordClone.Valore = newVal;
// METODO PER INSERT DOSSIER + FLUX
await MDService.DossiersInsert(currRecordClone);
//await reloadData(true);
//await ReloadData(true);
currRecordClone = null;
isEditing = false;
await Task.Delay(1);
@@ -236,7 +236,7 @@ namespace MP.SPEC.Components
giacenzeConf = await MDService.tryGetConfig("SPEC_ShowGiacenze");
ListArticoli = await MDService.ArticoliGetSearch(100000, selAzienda, "");
ListMacchine = await MDService.MacchineGetFilt("*");
await reloadData(true);
await ReloadData(true);
}
protected override async Task OnParametersSetAsync()
@@ -244,7 +244,7 @@ namespace MP.SPEC.Components
if (!lastFilter.Equals(SelFilter))
{
lastFilter = SelFilter.clone();
await reloadData(true);
await ReloadData(true);
}
}
@@ -299,7 +299,7 @@ namespace MP.SPEC.Components
protected async Task UpdateData()
{
currRecord = null;
await reloadData(true);
await ReloadData(true);
}
#endregion Protected Methods
@@ -429,7 +429,7 @@ namespace MP.SPEC.Components
isEditing = true;
}
private async Task reloadData(bool setChanged)
private async Task ReloadData(bool setChanged)
{
isLoading = true;
SearchRecords = await MDService.DossiersGetLastFilt(SelMacchina, SelArticolo, SelDtStart, SelDtEnd);
MP.SPEC/MP.SPEC.csproj
+2 -2
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP.SPEC</RootNamespace>
<Version>6.16.2302.2218</Version>
<Version>6.16.2303.3117</Version>
</PropertyGroup>
<ItemGroup>
@@ -39,7 +39,7 @@
<ItemGroup>
<PackageReference Include="Blazored.LocalStorage" Version="4.3.0" />
<PackageReference Include="Blazored.SessionStorage" Version="2.3.0" />
<PackageReference Include="EgwCoreLib.Razor" Version="1.3.2302.315" />
<PackageReference Include="EgwCoreLib.Razor" Version="1.4.2303.215" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="6.0.9" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
</ItemGroup>
MP.SPEC/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2302.2218</h4>
<h4>Versione: 6.16.2303.3117</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.SPEC/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2302.2218
6.16.2303.3117
MP.SPEC/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2302.2218</version>
<version>6.16.2303.3117</version>
<url>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>