From 56cd2b68f91f4446f61232f42c1cf7dfc16b14d3 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 25 Mar 2022 16:13:33 +0100
Subject: [PATCH 1/4] update errore "giallo" se rileggo UDC 2 volte su stessa
 pedana

---
 MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs b/MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs
index b1e58dca..144d666f 100644
--- a/MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs
+++ b/MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs
@@ -335,8 +335,12 @@ namespace MP_MAG.WebUserControls
                                     // se uguale OK
                                     else if (tabAL[0].AL == SelPedana)
                                     {
+                                        // 2022.03.25 modifica: se è già associato --> giallo!
+                                        cmp_barcode.showOutput("badge badge-warning", $"Attenzione: UDC già caricato su Pedana/AL ({tabAL[0].AL})");
+#if false
                                         // tutto ok
-                                        allOk = true;
+                                        allOk = true; 
+#endif
                                     }
                                     else
                                     {

From af2ec2190729887fda10097b96772bf1c71b6948 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 25 Mar 2022 16:40:04 +0100
Subject: [PATCH 2/4] Fix calcolo dataora prod x ODL chiusi in stampa

---
 MP-MAG/BaseUserControl.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/MP-MAG/BaseUserControl.cs b/MP-MAG/BaseUserControl.cs
index f2d5ee07..842e47cb 100644
--- a/MP-MAG/BaseUserControl.cs
+++ b/MP-MAG/BaseUserControl.cs
@@ -441,13 +441,19 @@ namespace MP_MAG
             {
                 // rileggo
                 prodPrintData newProdPrintData = MagDataLayerObj.currProdPrintData;
+                DateTime dtRif = DateTime.Now;
                 // calcolo
                 var tabOdl = DataLayerObj.taODL.getByIdx(newProdPrintData.IdxOdl, false);
+                // se ODL chiuso --> uso data chiusura x indicare data controllo
                 if (tabOdl.Rows.Count > 0)
                 {
                     newProdPrintData.QtaOdl = tabOdl[0].NumPezzi;
+                    if (!tabOdl[0].IsDataFineNull())
+                    {
+                        dtRif = tabOdl[0].DataFine;
+                    }
                 }
-                var tabDatiProdAct = DataLayerObj.taStatoProd.GetData(newProdPrintData.IdxMacchina, DateTime.Now);
+                var tabDatiProdAct = DataLayerObj.taStatoProd.GetData(newProdPrintData.IdxMacchina, dtRif);
                 if (tabDatiProdAct.Rows.Count > 0)
                 {
                     newProdPrintData.QtaConf = tabDatiProdAct[0].PzConfBuoni;

From 5dd1aba6a13b2faf0061e705f2d524ec9b6c8e31 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 25 Mar 2022 16:47:05 +0100
Subject: [PATCH 3/4] =?UTF-8?q?fix=20refresh=20vel=C3=B2oce=20in=20sel=20p?=
 =?UTF-8?q?edane?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs | 5 +++++
 MP-MAG/WebUserControls/cmp_gestPedane.ascx      | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs
index d2f03fc8..3591bd8a 100644
--- a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs
+++ b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs
@@ -115,6 +115,11 @@ namespace MP_MAG.WebUserControls
             { }
             // descrizione
             txtDescr.Text = $"{newNum}";
+            // se sono in add --> sollevo evento editing
+            if (divAddNew.Visible)
+            {
+                raiseEditing();
+            }
         }
 
         #endregion Private Methods
diff --git a/MP-MAG/WebUserControls/cmp_gestPedane.ascx b/MP-MAG/WebUserControls/cmp_gestPedane.ascx
index b45f6a9e..a3c02fe2 100644
--- a/MP-MAG/WebUserControls/cmp_gestPedane.ascx
+++ b/MP-MAG/WebUserControls/cmp_gestPedane.ascx
@@ -18,6 +18,6 @@
             </div>
         </div>
         <asp:HiddenField runat="server" ID="hfPackListID" />
-        <asp:Timer runat="server" ID="timerGestPed" Interval="2000" OnTick="timerGestPed_Tick" />
+        <asp:Timer runat="server" ID="timerGestPed" Interval="5000" OnTick="timerGestPed_Tick" />
     </ContentTemplate>
 </asp:UpdatePanel>
\ No newline at end of file

From ce88caa94a539f239fc2843fa7e374fd2008157c Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 25 Mar 2022 16:56:09 +0100
Subject: [PATCH 4/4] Fix gestione add ordini paerti qta -_> qtaEvadibile

---
 MP-MAG/WebUserControls/cmp_OrderListAdd.ascx.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MP-MAG/WebUserControls/cmp_OrderListAdd.ascx.cs b/MP-MAG/WebUserControls/cmp_OrderListAdd.ascx.cs
index e8d3ff77..b95b4647 100644
--- a/MP-MAG/WebUserControls/cmp_OrderListAdd.ascx.cs
+++ b/MP-MAG/WebUserControls/cmp_OrderListAdd.ascx.cs
@@ -59,7 +59,7 @@ namespace MP_MAG.WebUserControls
                 var ordiniCaricati = tabOrdiniCaricati.Where(x => x.ExtOrdCod == keySel);
                 if (ordiniCaricati.ToList().Count == 0)
                 {
-                    MagData.MagDataLayer.man.taOList.insertQuery(PackListID, keySel, rigaOrd.CodArticolo, descrOrd, rigaOrd.Qta, rigaOrd.CodCliente, rigaOrd.CodDestinazione);
+                    MagData.MagDataLayer.man.taOList.insertQuery(PackListID, keySel, rigaOrd.CodArticolo, descrOrd, rigaOrd.QtaEvadibile, rigaOrd.CodCliente, rigaOrd.CodDestinazione);
                 }
                 raiseAddNew();
             }