From c05e542e5bef77ca818dc2f8323eb3dff0d31291 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 13 Jan 2021 12:16:34 +0100
Subject: [PATCH] inizio modifica x pezzi confermati vs ordinati

---
 MP-MAG/WebUserControls/cmp_currODL.ascx   | 14 ++++++++++++--
 MP-MAG/WebUserControls/cmp_jumper.ascx.cs |  9 ++++++++-
 MagData/Objects.cs                        | 10 +++++++++-
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/MP-MAG/WebUserControls/cmp_currODL.ascx b/MP-MAG/WebUserControls/cmp_currODL.ascx
index 1d69cdc8..4b5706bd 100644
--- a/MP-MAG/WebUserControls/cmp_currODL.ascx
+++ b/MP-MAG/WebUserControls/cmp_currODL.ascx
@@ -36,13 +36,23 @@
             <li class="list-group-item">
                 <div class="row">
                     <div class="col-6 text-left">
-                        # pezzi
+                        # pezzi ordinati
                     </div>
-                    <div class="col-6 text-right font-weight-bold">
+                    <div class="col-6 text-right font-weight-bold text-secondary">
                         <%: currData.QtaOdl %>
                     </div>
                 </div>
             </li>
+            <li class="list-group-item">
+                <div class="row">
+                    <div class="col-6 text-left">
+                        # pezzi confermati
+                    </div>
+                    <div class="col-6 text-right font-weight-bold text-success">
+                        <%: currData.QtaConf%>
+                    </div>
+                </div>
+            </li>
         </ul>
     </div>
 </div>
\ No newline at end of file
diff --git a/MP-MAG/WebUserControls/cmp_jumper.ascx.cs b/MP-MAG/WebUserControls/cmp_jumper.ascx.cs
index 5d7797ef..c97bac13 100644
--- a/MP-MAG/WebUserControls/cmp_jumper.ascx.cs
+++ b/MP-MAG/WebUserControls/cmp_jumper.ascx.cs
@@ -25,6 +25,7 @@ namespace MP_MAG.WebUserControls
             string CliCod = "";
             string CliDescr = "";
             string OrdRifExt = "";
+            int QtaConf = 0;
             int QtaOdl = 0;
             string Lotto = "";
             string CodPost = IdxMacchina;
@@ -42,7 +43,13 @@ namespace MP_MAG.WebUserControls
                     ArtCod = tabArt[0].CodArt;
                     ArtDesc = tabArt[0].DescrArt;
                     QtaOdl = tabOdl[0].NumPezzi;
+                    // cerco qta confermata
 
+                    var tabDatiProdAct = DataLayerObj.taStatoProd.GetData(IdxMacchina, DateTime.Now);
+                    if (tabDatiProdAct.Rows.Count > 0)
+                    {
+                        QtaConf = tabDatiProdAct[0].PzConfBuoni;
+                    }
                     var tabAA2C = MagDataLayerObj.taAA2C.getByCodArt(ArtCod);
                     if (tabAA2C.Rows.Count > 0)
                     {
@@ -50,7 +57,7 @@ namespace MP_MAG.WebUserControls
                     }
                 }
             }
-            MagData.prodPrintData newProdPrintData = new MagData.prodPrintData(MatrOpr, IdxODL, IdxMacchina, QtaUdc, isFinito, ArtCod, ArtDesc, CliCod, CliDescr, OrdRifExt, QtaOdl, Lotto, CodPost);
+            MagData.prodPrintData newProdPrintData = new MagData.prodPrintData(MatrOpr, IdxODL, IdxMacchina, QtaUdc, isFinito, ArtCod, ArtDesc, CliCod, CliDescr, OrdRifExt, QtaConf, QtaOdl, Lotto, CodPost);
             // salvo in oggetto dedicato...
             MagData.MagDataLayer.man.currProdPrintData = newProdPrintData;
             string tgtPage = "";
diff --git a/MagData/Objects.cs b/MagData/Objects.cs
index 9e5b11d6..e5a7f07a 100644
--- a/MagData/Objects.cs
+++ b/MagData/Objects.cs
@@ -118,10 +118,11 @@ namespace MagData
         /// <param name="CliCod"></param>
         /// <param name="CliDescr"></param>
         /// <param name="OrdRifExt"></param>
+        /// <param name="QtaConf"></param>
         /// <param name="QtaOdl"></param>
         /// <param name="Lotto"></param>
         /// <param name="CodPost"></param>
-        public prodPrintData(int MatrOpr, int IdxOdl, string IdxMacchina, int QtaUdc, bool isProdFinito, string ArtCod, string ArtDesc, string CliCod, string CliDescr, string OrdRifExt, int QtaOdl, string Lotto, string CodPost)
+        public prodPrintData(int MatrOpr, int IdxOdl, string IdxMacchina, int QtaUdc, bool isProdFinito, string ArtCod, string ArtDesc, string CliCod, string CliDescr, string OrdRifExt, int QtaConf, int QtaOdl, string Lotto, string CodPost)
         {
             this.ArtCod = ArtCod;
             this.ArtDesc = ArtDesc;
@@ -134,6 +135,7 @@ namespace MagData
             this.Lotto = Lotto;
             this.MatrOpr = MatrOpr;
             this.OrdRifExt = OrdRifExt;
+            this.QtaConf = QtaConf;
             this.QtaOdl = QtaOdl;
             this.QtaUdc = QtaUdc;
         }
@@ -151,6 +153,7 @@ namespace MagData
             this.Lotto = "";
             this.MatrOpr = 0;
             this.OrdRifExt = "";
+            this.QtaConf = 0;
             this.QtaOdl = 1;
             this.QtaUdc = 1;
         }
@@ -219,6 +222,11 @@ namespace MagData
         /// </summary>
         public string PrintQueue { get; set; } = "";
 
+        /// <summary>
+        /// Quantità Prodotta/confermata x ODL
+        /// </summary>
+        public int QtaConf { get; set; } = 0;
+
         /// <summary>
         /// Quantità ordinata ODL
         /// </summary>