From aaa9f991f321abbcae4979c20b6f47e014ca59ca Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 19 Nov 2025 19:13:25 +0100 Subject: [PATCH] Completato metodo creazione ord da offerta con elenco items da poter inviare in richiesta... --- .../Controllers/LuxController.cs | 87 ++----------------- Lux.API/Lux.API.csproj | 2 +- Lux.UI/Lux.UI.csproj | 2 +- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- 6 files changed, 11 insertions(+), 86 deletions(-) diff --git a/EgwCoreLib.Lux.Data/Controllers/LuxController.cs b/EgwCoreLib.Lux.Data/Controllers/LuxController.cs index 729db914..df610915 100644 --- a/EgwCoreLib.Lux.Data/Controllers/LuxController.cs +++ b/EgwCoreLib.Lux.Data/Controllers/LuxController.cs @@ -1924,43 +1924,6 @@ namespace EgwCoreLib.Lux.Data.Controllers StepPrice = c.StepPrice }) .ToList(); - // sistemo UID... - foreach (var item in newRec.OrderRowNav) - { - item.OrderRowUID = item.OrderRowCode; - - // alternativa da valutare.. - if (true) - { - // genero tanti record collegati alla riga d'ordine... - for (int i = 0; i < item.ProdItemQtyTot; i++) - { - var child = new ProductionItemModel - { - OrderRowID = item.OrderRowID, - //OrderRowNav = item, - ItemCode = i + 1, - ExtItemCode = $"{item.OrderRowUID}-{i + 1}", - ProductionBatchID = null - }; - // aggiungo record - item.ProdItemNav.Add(child); - } - } - else - { - item.ProdItemNav = Enumerable.Range(1, (int)item.ProdItemQtyTot) - .Select(i => new ProductionItemModel - { - //OrderRowID = item.OrderRowID, - OrderRowNav = item, - ItemCode = i, - ExtItemCode = $"{item.OrderRowUID}-{i}", - ProductionBatchID = null - }) - .ToList(); - } - } // infine aggiungo riga ordine e relativi child dbCtx.DbSetOrder.Add(newRec); } @@ -1976,7 +1939,7 @@ namespace EgwCoreLib.Lux.Data.Controllers { item.OrderRowUID = item.OrderRowCode; // alternativa da valutare.. - if (true) + if (false) { // genero tanti record collegati alla riga d'ordine... for (int i = 0; i < item.ProdItemQtyTot; i++) @@ -1986,7 +1949,7 @@ namespace EgwCoreLib.Lux.Data.Controllers OrderRowID = item.OrderRowID, //OrderRowNav = item, ItemCode = i + 1, - ExtItemCode = $"{item.OrderRowUID}-{i + 1}", + ExtItemCode = $"{item.OrderRowCode}-{i + 1:000}", ProductionBatchID = null }; // aggiungo record @@ -2001,58 +1964,20 @@ namespace EgwCoreLib.Lux.Data.Controllers //OrderRowID = item.OrderRowID, OrderRowNav = item, ItemCode = i, - ExtItemCode = $"{item.OrderRowUID}-{i}", + ExtItemCode = $"{item.OrderRowCode}-{i:000}", ProductionBatchID = null }) .ToList(); } - } + dbCtx.Entry(item).State = EntityState.Modified; + } // salvo ulteriori variazioni await dbCtx.SaveChangesAsync(); } -#if false - // se andata... - if (answ && newRec != null) - { - // genero la lista record delle parts (solo come ID correlati...) x ogni riga... - foreach (var item in newRec.OrderRowNav) - { - // alternativa da valutare.. - if (false) - { - item.ProdItemNav = Enumerable.Range(1, (int)item.ProdItemQtyTot) - .Select(i => new ProductionItemModel - { - OrderRowNav = item, - ItemCode = i, - ExtItemCode = $"EXT-{i}" - }) - .ToList(); - } - else - { - // genero tanti record collegati alla riga d'ordine... - for (int i = 0; i < item.ProdItemQtyTot; i++) - { - var child = new ProductionItemModel - { - OrderRowNav = item, // link via navigation - ItemCode = i + 1, // example data - ExtItemCode = $"EXT-{i + 1}" - }; - // aggiungo record - item.ProdItemNav.Add(child); - } - } - } - // salvo TUTTI i cambiamenti... - await dbCtx.SaveChangesAsync(); - } -#endif } catch (Exception exc) { - Log.Error($"Eccezione durante OfferClone{Environment.NewLine}{exc}"); + Log.Error($"Eccezione durante OrderFromOffer{Environment.NewLine}{exc}"); } } return answ; diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index 6c80358b..83c8f61f 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 0.9.2511.1918 + 0.9.2511.1919 diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj index 17ace105..0fe3047f 100644 --- a/Lux.UI/Lux.UI.csproj +++ b/Lux.UI/Lux.UI.csproj @@ -5,7 +5,7 @@ enable enable aspnet-Lux.UI-a758c101-a2f4-4e38-977d-1c4887dbbd50 - 0.9.2511.1917 + 0.9.2511.1919 diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 44e1b73a..68410a43 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ LUX - Web Windows MES -

Versione: 0.9.2511.1918

+

Versione: 0.9.2511.1919


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 3524dfca..24a4a582 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -0.9.2511.1918 +0.9.2511.1919 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index f9cac2c5..b5b8ace2 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 0.9.2511.1918 + 0.9.2511.1919 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false