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; 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(); } 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 { 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 @@ - + \ No newline at end of file