diff --git a/MP-IO/Controllers/IOBController.cs b/MP-IO/Controllers/IOBController.cs index daddc025..4fa383e6 100644 --- a/MP-IO/Controllers/IOBController.cs +++ b/MP-IO/Controllers/IOBController.cs @@ -11,6 +11,8 @@ namespace MP_IO.Controllers { public class IOBController : Controller { + #region Public Methods + /// /// SALVA x macchina KVP parametro/valore: /// @@ -308,7 +310,7 @@ namespace MP_IO.Controllers } /// - /// Chiude ODL precedente ed avvia uno nuovo (duplicandolo) + /// Chiude ODL precedente ed avvia uno nuovo (duplicandolo), e CONFERMA produzione... /// /// GET: IOB/forceSplitOdl/SIMUL_03 /// @@ -1322,5 +1324,7 @@ namespace MP_IO.Controllers } return answ; } + + #endregion Public Methods } } \ No newline at end of file diff --git a/MP-TAB/ODL.aspx.cs b/MP-TAB/ODL.aspx.cs index a7391815..bb9aa391 100644 --- a/MP-TAB/ODL.aspx.cs +++ b/MP-TAB/ODL.aspx.cs @@ -120,7 +120,7 @@ namespace MoonProTablet { rigaProd = DataLayerObj.taPzProd2conf.GetData(idxMacchinaFix)[0]; pz2conf = rigaProd.pezziNonConfermati; - needConfProd = (pz2conf > 0); + needConfProd = (pz2conf > 0 && ! isSlave); } catch (Exception exc) { diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs index 59803c20..9b474dcd 100644 --- a/MapoDb/DataLayer.cs +++ b/MapoDb/DataLayer.cs @@ -34,6 +34,7 @@ namespace MapoDb public DS_IntServTableAdapters.ProduzioneAs400TableAdapter taAs400; public DS_ProdTempiTableAdapters.CalendFesteFerieTableAdapter taCalFF; public DS_UtilityTableAdapters.CommentiTableAdapter taComm; + public DS_ProdTempiTableAdapters.DatiConfermatiTableAdapter taDatiConf; public DS_ProdTempiTableAdapters.DatiMacchineTableAdapter taDatiMacchine; public DS_ProdTempiTableAdapters.DatiProduzioneTableAdapter taDatiProd; public DS_ProdTempiTableAdapters.stp_repDonati_getDatiProdMacchinaTableAdapter taDatiProdMacch; @@ -497,6 +498,7 @@ namespace MapoDb taFL = new DS_applicazioneTableAdapters.FluxLogTableAdapter(); taAnagArt = new DS_ProdTempiTableAdapters.AnagArticoliTableAdapter(); taODL = new DS_ProdTempiTableAdapters.ODLTableAdapter(); + taDatiConf = new DS_ProdTempiTableAdapters.DatiConfermatiTableAdapter(); taDatiMacchine = new DS_ProdTempiTableAdapters.DatiMacchineTableAdapter(); taDatiProdMacch = new DS_ProdTempiTableAdapters.stp_repDonati_getDatiProdMacchinaTableAdapter(); taDatiProdMacchPer = new DS_ProdTempiTableAdapters.stp_repDonati_getDatiProdMacchinaPeriodoTableAdapter(); @@ -557,6 +559,7 @@ namespace MapoDb taFL.Connection.ConnectionString = connectionString; taAnagArt.Connection.ConnectionString = connectionString; taODL.Connection.ConnectionString = connectionString; + taDatiConf.Connection.ConnectionString = connectionString; taDatiMacchine.Connection.ConnectionString = connectionString; taDatiProdMacch.Connection.ConnectionString = connectionString; taDatiProdMacchPer.Connection.ConnectionString = connectionString; @@ -1465,9 +1468,13 @@ namespace MapoDb // attendo 1 sec Thread.Sleep(1000); adesso = DateTime.Now; + // chiamo conferma produzione... + taPzProd2conf.stp_ConfermaProduzCompleta(currData[0].IdxMacchina, MatrOpr, DateTime.Now.AddDays(-10), DateTime.Now, 0, 0, 1, DateTime.Now, false); + // attendo 500 msec + Thread.Sleep(500); // chiamo splitOdl MapoDbObj.taODL.splitODL(currData[0].IdxODL, 0, idxMacchina, currData[0].TCRichAttr, currData[0].PzPallet, $"Nuovo ODL da forceSplitOdl", true); - // attendo 1 sec + // attendo 1000 msec Thread.Sleep(1000); adesso = DateTime.Now; // registro fine ODL (idxTipoEv = 1)