From 0e646b1d6fbd25aa20d00c5e28ea5b594743f98b Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 24 Feb 2025 11:40:02 +0100 Subject: [PATCH] Update stored AutoODL --- MapoDb/DS_ProdTempi.xsd | 560 ++++++++++++++++++++-------------------- MapoDb/DS_ProdTempi.xss | 30 +-- MapoDb/DataLayer.cs | 1 + MapoDb/MapoDb.csproj | 1 - MapoDb/app.config | 31 +-- 5 files changed, 305 insertions(+), 318 deletions(-) diff --git a/MapoDb/DS_ProdTempi.xsd b/MapoDb/DS_ProdTempi.xsd index 4f9097e8..22f2e0d3 100644 --- a/MapoDb/DS_ProdTempi.xsd +++ b/MapoDb/DS_ProdTempi.xsd @@ -269,7 +269,7 @@ FROM v_ODL_exp ORDER BY IdxODL DESC - + dbo.stp_ODL_AutoDayGenerFull @@ -290,7 +290,7 @@ FROM v_ODL_exp ORDER BY IdxODL DESC - + dbo.stp_ODL_AutoStart @@ -309,7 +309,7 @@ FROM v_ODL_exp ORDER BY IdxODL DESC - + dbo.stp_ODL_clearSetup @@ -321,7 +321,7 @@ FROM v_ODL_exp ORDER BY IdxODL DESC - + dbo.stp_ODL_deleteQuery @@ -332,7 +332,7 @@ FROM v_ODL_exp ORDER BY IdxODL DESC - + dbo.stp_ODL_dividiDaAltraTav @@ -345,7 +345,7 @@ FROM v_ODL_exp ORDER BY IdxODL DESC - + dbo.stp_ODL_fineProd @@ -357,7 +357,7 @@ FROM v_ODL_exp ORDER BY IdxODL DESC - + dbo.stp_ODL_fixMachineSlave @@ -370,7 +370,7 @@ FROM v_ODL_exp ORDER BY IdxODL DESC - + dbo.stp_ODL_forceClose @@ -488,7 +488,7 @@ FROM v_ODL_exp ORDER BY IdxODL DESC - + dbo.stp_ODL_inizioSetup @@ -504,7 +504,7 @@ FROM v_ODL_exp ORDER BY IdxODL DESC - + dbo.stp_ODL_inizioSetupPromessa @@ -521,7 +521,7 @@ FROM v_ODL_exp ORDER BY IdxODL DESC - + dbo.stp_ODL_inizioSetupPromessaPostuma @@ -534,7 +534,7 @@ FROM v_ODL_exp ORDER BY IdxODL DESC - + dbo.stp_ODL_insertProvv @@ -550,7 +550,7 @@ FROM v_ODL_exp ORDER BY IdxODL DESC - + dbo.stp_ODL_insertQuery @@ -568,7 +568,7 @@ FROM v_ODL_exp ORDER BY IdxODL DESC - + dbo.stp_ODL_insPostumo @@ -591,7 +591,7 @@ FROM v_ODL_exp ORDER BY IdxODL DESC - + dbo.stp_ODL_split @@ -609,7 +609,7 @@ FROM v_ODL_exp ORDER BY IdxODL DESC - + dbo.stp_ODL_updateQta @@ -622,7 +622,7 @@ FROM v_ODL_exp ORDER BY IdxODL DESC - + dbo.stp_ODL_update @@ -642,7 +642,7 @@ FROM v_ODL_exp ORDER BY IdxODL DESC - + dbo.stp_ODL_updateSetup @@ -2511,7 +2511,7 @@ FROM v_ECP - + dbo.stp_StatoProd_getByMacchina @@ -2535,6 +2535,7 @@ FROM v_ECP + @@ -2628,109 +2629,109 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I - + - + - + - + - - - + + + - + - - + + - + - + - + - + - - - - - + + + + + - - + + - - - - + + + + - - + + - + @@ -2740,53 +2741,53 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I - + - + - + - + - + - + - - + + - + @@ -2796,72 +2797,72 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I - + - - + + - - + + - - - + + + - + - + - + - + - + - + - - - + + + @@ -2871,70 +2872,70 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I - + - + - - - + + + - + - - - - - - + + + + + + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - + - - + + @@ -2944,50 +2945,50 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I - + - + - + - - - - - - + + + + + + - + - - - - - - - - + + + + + + + + - + @@ -2997,178 +2998,178 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I - + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - + + - + - - - - - + + + + + - + - + - - - + + + - + - - - + + + - + - + - + - - - + + + - + - - - - + + + + - - + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + @@ -3178,35 +3179,35 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I - + - + - + - + - - - - - + + + + + @@ -3216,36 +3217,36 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I - + - - - + + + - - + + - - - + + + - + @@ -3255,63 +3256,63 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I - + - + - - + + - + - - + + - + - - - + + + - + - + @@ -3321,89 +3322,89 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I - + - - + + - + - - - + + + - + - + - + - + - + - - - - - - + + + + + + - + - - + + @@ -3413,32 +3414,32 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I - + - - + + - - - - - - - + + + + + + + - - + + @@ -3448,39 +3449,40 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I - + - + - - - - - - - - - + + + + + + + + + + - + - + - + diff --git a/MapoDb/DS_ProdTempi.xss b/MapoDb/DS_ProdTempi.xss index 8bbfcec7..bd561064 100644 --- a/MapoDb/DS_ProdTempi.xss +++ b/MapoDb/DS_ProdTempi.xss @@ -4,32 +4,32 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - + + - + - - + + - + - + - - + + - - - + + + - - + + \ No newline at end of file diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs index 5ba70cbe..cce79563 100644 --- a/MapoDb/DataLayer.cs +++ b/MapoDb/DataLayer.cs @@ -832,6 +832,7 @@ namespace MapoDb Log.Info($"Eccezione in ConfermaProduzione{Environment.NewLine}{exc}", tipoLog.EXCEPTION); } } + // 2025.02.19 portato da 100 a 1000 ms attesa x evitare che ODL sia avviato PRIMA della conferma // attendo 1000 msec x chiudere ODL Thread.Sleep(1000); // chiamo splitOdl diff --git a/MapoDb/MapoDb.csproj b/MapoDb/MapoDb.csproj index 8a0a08f6..6053d09d 100644 --- a/MapoDb/MapoDb.csproj +++ b/MapoDb/MapoDb.csproj @@ -385,7 +385,6 @@ Designer MSDataSetGenerator - DS_ProdTempi1.Designer.cs DS_ProdTempi.xsd diff --git a/MapoDb/app.config b/MapoDb/app.config index 016338f7..02bee836 100644 --- a/MapoDb/app.config +++ b/MapoDb/app.config @@ -5,29 +5,14 @@
- - - - - - - - + + + + + + + +