Merge branch 'Release/SPEC_POdlFixSelArt01'

This commit is contained in:
Samuele Locatelli
2024-11-15 15:47:57 +01:00
5 changed files with 18 additions and 39 deletions
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP.SPEC</RootNamespace>
<Version>6.16.2411.610</Version>
<Version>6.16.2411.1515</Version>
<UserSecretsId>1800a78a-6ff1-40f9-b490-87fb8bfc1394</UserSecretsId>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
</PropertyGroup>
+14 -35
View File
@@ -76,19 +76,6 @@ namespace MP.SPEC.Pages
#region Protected Methods
/// <summary>
/// Crea nuovo record e va in editing...
/// </summary>
/// <returns></returns>
protected async Task addNew()
{
currRecord = new PODLExpModel()
{
CodArticolo = $"_NEW_{DateTime.Now:yyyyMMdd.HHmmss}"
};
await Task.Delay(1);
}
protected async Task cancel()
{
currRecord = null;
@@ -100,7 +87,7 @@ namespace MP.SPEC.Pages
{
canEdit = true;
// preseleziono ricerca articolo
artSearch = selRec.CodArticolo;
artSearch = selRec.CodArticolo.Length > nArtSearch ? selRec.CodArticolo.Substring(0, nArtSearch) : selRec.CodArticolo;
currRecord = selRec;
await Task.Delay(1);
}
@@ -160,6 +147,11 @@ namespace MP.SPEC.Pages
{
bool.TryParse(SPEC_XODL_sync, out enableForceSync);
}
string SPEC_nArtSearch = await MDService.ConfigTryGet("SPEC_nArtSearch");
if (!string.IsNullOrEmpty(SPEC_nArtSearch))
{
int.TryParse(SPEC_nArtSearch, out nArtSearch);
}
}
protected override async Task OnParametersSetAsync()
@@ -210,7 +202,7 @@ namespace MP.SPEC.Pages
}
currRecord = new PODLExpModel()
{
CodArticolo = currArticolo,
CodArticolo = "",//currArticolo,
KeyBCode = codExt,
KeyRichiesta = codExt,
CodGruppo = codGruppo,
@@ -266,7 +258,7 @@ namespace MP.SPEC.Pages
await Task.Delay(1);
var clonedRec = MP.Data.Utils.POdlExt.convertToPOdl(selRec);
// se x qualche motivo mancasse codGruppo --> sistemo!
if(string.IsNullOrEmpty(clonedRec.CodGruppo))
if (string.IsNullOrEmpty(clonedRec.CodGruppo))
{
clonedRec.CodGruppo = currGruppoSel.CodGruppo;
Log.Error($"CodGruppo mancante: messo valore selezionato: {currGruppoSel.CodGruppo}");
@@ -296,20 +288,15 @@ namespace MP.SPEC.Pages
#region Private Fields
private static Logger Log = LogManager.GetCurrentClassLogger();
private PODLExpModel? _currRecord = null;
private AnagGruppi currGruppoSel = new AnagGruppi();
private PODLExpModel currRecordControlli = new PODLExpModel();
private List<AnagArticoli>? ListArticoli;
private List<AnagGruppi>? ListAziende;
private List<AnagGruppi>? ListGruppiFase;
private List<Macchine>? ListMacchine;
private List<ListValues>? ListStati;
private int nArtSearch = 5;
#endregion Private Fields
@@ -339,6 +326,10 @@ namespace MP.SPEC.Pages
_artSearch = value;
var pUpd = Task.Run(async () =>
{
if (currRecord != null)
{
currRecord.CodArticolo = "";
}
await ReloadData();
});
pUpd.Wait();
@@ -346,13 +337,7 @@ namespace MP.SPEC.Pages
}
}
private string btnNewText
{
get => currArticolo == "" ? "Sel Articolo" : "Nuovo PODL";
}
private bool canEdit { get; set; } = false;
private string currArticolo { get; set; } = "";
private string currAzienda
{
@@ -395,13 +380,7 @@ namespace MP.SPEC.Pages
private PODLExpModel? currRecord
{
get => _currRecord;
set
{
_currRecord = value;
#if false
artSearch = value == null ? "" : value.CodArticolo.Substring(0, 2);
#endif
}
set { _currRecord = value; }
}
private bool filtActive
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2411.610</h4>
<h4>Versione: 6.16.2411.1515</h4>
<br /> Note di rilascio:
<ul>
<li>
+1 -1
View File
@@ -1 +1 @@
6.16.2411.610
6.16.2411.1515
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2411.610</version>
<version>6.16.2411.1515</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>