diff --git a/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx b/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx index 88dac7b5..e44ef14b 100644 --- a/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx +++ b/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx @@ -5,7 +5,8 @@ + OnSorted="grView_Sorted" OnRowUpdating="grView_RowUpdating" + OnRowEditing="grView_RowEditing" onrowcancelingedit="grView_RowCancelingEdit"> @@ -94,7 +95,7 @@ + OnUpdated="ods_Updated"> diff --git a/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx.cs b/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx.cs index 7f33e6b5..615fdcb1 100644 --- a/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx.cs @@ -498,6 +498,19 @@ namespace GMW.WebUserControls { } memLayer.ML.setSessionVal("UdcByPart_conditio", particolare); } + /// + /// ridisegno x cancel editing + /// + /// + /// + protected void grView_RowCancelingEdit(object sender, GridViewCancelEditEventArgs e) + { + // sollevo evento nuovo valore... + if (eh_nuovoValore != null) + { + eh_nuovoValore(this, new EventArgs()); + } + } #endregion diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index b14539e0..04092691 100644 Binary files a/GMW/GMW/bin/GMW.dll and b/GMW/GMW/bin/GMW.dll differ diff --git a/GMW/GMW/bin/GMW_data.dll b/GMW/GMW/bin/GMW_data.dll index 2e98f5c5..ba76d6c9 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/bin/SteamWare.dll b/GMW/GMW/bin/SteamWare.dll index ba92c82c..35a826d9 100644 Binary files a/GMW/GMW/bin/SteamWare.dll and b/GMW/GMW/bin/SteamWare.dll differ diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index b14539e0..1ea21557 100644 Binary files a/GMW/GMW/obj/Debug/GMW.dll and b/GMW/GMW/obj/Debug/GMW.dll differ diff --git a/GMW/GMW/obj/Release/GMW.dll b/GMW/GMW/obj/Release/GMW.dll index 2f636881..04092691 100644 Binary files a/GMW/GMW/obj/Release/GMW.dll and b/GMW/GMW/obj/Release/GMW.dll differ diff --git a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache index 367ada6b..837e5f97 100644 Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index a38ab583..0bb96be7 100644 Binary files a/GMW/GMW_Term/bin/GMW_Term.dll and b/GMW/GMW_Term/bin/GMW_Term.dll differ diff --git a/GMW/GMW_Term/bin/GMW_data.dll b/GMW/GMW_Term/bin/GMW_data.dll index ff16f1da..9402bd72 100644 Binary files a/GMW/GMW_Term/bin/GMW_data.dll and b/GMW/GMW_Term/bin/GMW_data.dll differ diff --git a/GMW/GMW_Term/bin/SteamWare.dll b/GMW/GMW_Term/bin/SteamWare.dll index ba92c82c..4a1aa17b 100644 Binary files a/GMW/GMW_Term/bin/SteamWare.dll and b/GMW/GMW_Term/bin/SteamWare.dll differ diff --git a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj index bc5ab504..c37f2173 100644 --- a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj +++ b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj @@ -331,7 +331,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW_Term" "ProductCode" = "8:{0002F6D7-B175-44CF-BBAB-48486502FF8E}" - "PackageCode" = "8:{30D9ECA7-F24B-49DF-B303-334CF7F6D4DD}" + "PackageCode" = "8:{4A2DF545-DF27-4C28-B9B1-332F564AB543}" "UpgradeCode" = "8:{B348C50D-8DAD-4430-AEF0-60800C94CB78}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" @@ -810,7 +810,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_9C1BA08A590A44EC9515C0F91AD50A1D" { - "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe" + "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A89965CB827F476CB8D496FFFC9653DF" @@ -838,7 +838,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B0271B832DBE45F0B50639E61DAE3CF4" { - "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe" + "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A89965CB827F476CB8D496FFFC9653DF" diff --git a/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi b/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi index 6f450b38..372f34cb 100644 Binary files a/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi and b/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi differ diff --git a/GMW/GMW_WS/bilance.asmx.cs b/GMW/GMW_WS/bilance.asmx.cs index 55c3c76d..98dd0fd9 100644 --- a/GMW/GMW_WS/bilance.asmx.cs +++ b/GMW/GMW_WS/bilance.asmx.cs @@ -1075,6 +1075,41 @@ namespace GMW_WS return answ; } /// + /// Sposta un UDC da 88 a 84 (SENZA consumo immediato se da web.config) + /// + /// codice dell'UDC) + /// codice dell'operatore + /// restituisce true/false a seconda che sia riuscito a fare lo spostamento + [WebMethod(Description = "Sposta un UDC da 88 a 84 (SENZA consumo immediato se da web.config)")] + public bool UdcCall_rientroInOVAS(string UDC_req, string CodSoggetto) + { + // trim fix + string UDC_reqTrim = UDC_req.Trim(); + string CodSoggettoTrim = CodSoggetto.Trim(); + string CodCs = memLayer.ML.confReadString("CodCS"); + int idxCellaTo = MagClass.magazzino.taCelle.getByCodMag(CodCs, "84")[0].IdxCella; // è la cella WIP del mag 84... + + // init + bool answ = false; + // loggo tutto! + if (logLevel > 5) + { + try + { + logger.lg.scriviLog(string.Format("UdcCall_rientroInWip: {0} | {1}", UDC_reqTrim, CodSoggettoTrim), tipoLog.INFO); + } + catch + { } + } + try + { + answ = MagClass.magazzino.spostaUDC(CodCs, UDC_reqTrim, idxCellaTo); + } + catch + { } + return answ; + } + /// /// Sposta un UDC da 88 a 54 /// /// codice dell'UDC) diff --git a/GMW/GMW_WS/bin/GMW.dll b/GMW/GMW_WS/bin/GMW.dll index b14539e0..1976d8c5 100644 Binary files a/GMW/GMW_WS/bin/GMW.dll and b/GMW/GMW_WS/bin/GMW.dll differ diff --git a/GMW/GMW_WS/bin/GMW_WS.dll b/GMW/GMW_WS/bin/GMW_WS.dll index bf4118da..aeccb971 100644 Binary files a/GMW/GMW_WS/bin/GMW_WS.dll and b/GMW/GMW_WS/bin/GMW_WS.dll differ diff --git a/GMW/GMW_WS/bin/GMW_data.dll b/GMW/GMW_WS/bin/GMW_data.dll index 2e98f5c5..0aba7035 100644 Binary files a/GMW/GMW_WS/bin/GMW_data.dll and b/GMW/GMW_WS/bin/GMW_data.dll differ diff --git a/GMW/GMW_WS/bin/SteamWare.dll b/GMW/GMW_WS/bin/SteamWare.dll index ba92c82c..a5f2ac03 100644 Binary files a/GMW/GMW_WS/bin/SteamWare.dll and b/GMW/GMW_WS/bin/SteamWare.dll differ diff --git a/GMW/GMW_WS/obj/Release/GMW_WS.dll b/GMW/GMW_WS/obj/Release/GMW_WS.dll index 002c77fa..aeccb971 100644 Binary files a/GMW/GMW_WS/obj/Release/GMW_WS.dll and b/GMW/GMW_WS/obj/Release/GMW_WS.dll differ diff --git a/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache index 25b7487b..29ef088e 100644 Binary files a/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi b/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi index ac64c416..76eb813e 100644 Binary files a/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi and b/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi differ diff --git a/GMW/GMW_data/SqlScripts/GMW_00315.sql b/GMW/GMW_data/SqlScripts/GMW_00315.sql index 422d5485..5bc4ff14 100644 --- a/GMW/GMW_data/SqlScripts/GMW_00315.sql +++ b/GMW/GMW_data/SqlScripts/GMW_00315.sql @@ -340,6 +340,108 @@ commit go +set xact_abort on +go + +begin transaction +go + +set ANSI_NULLS on +go + +/*************************************** +* STORED stp_processaSpedizTerz +* +* effettua la spedizione verso i terzisti, se deliberati è ok così, se non deliberati restano in posizione 305 da deliberare +* +* Steamware, S.E.L. +* mod: 2010.11.17 +* +****************************************/ +create PROCEDURE stp_processaSpedizTerz +AS + +-- UDC x cursore +DECLARE @UDC NVARCHAR(50) -- UDC SQL +-- evento da usare +DECLARE @CodEvento AS NVARCHAR(10) +SET @CodEvento = 'SpeWipTerz' + + + -- Dichiaro e carico il cursore + DECLARE Udc4Ter CURSOR LOCAL FOR + SELECT UDC FROM ElencoCartellini WHERE IdxPosizione IN (SELECT IdxPosizione FROM TabTranPosizEventi WHERE CodEvento = @CodEvento) + + OPEN Udc4Ter + FETCH NEXT FROM Udc4Ter + INTO @UDC + + WHILE @@FETCH_STATUS = 0 + BEGIN + -- processo gli UDC... + UPDATE ElencoCartellini + SET IdxPosizione = ttpe.IdxPosizioneTo + FROM ElencoCartellini ec INNER JOIN TabTranPosizEventi ttpe ON ec.IdxPosizione=ttpe.IdxPosizione + WHERE ec.UDC = @UDC AND ttpe.CodEvento = @CodEvento + + FETCH NEXT FROM Udc4Ter INTO @UDC + END + CLOSE Udc4Ter + DEALLOCATE Udc4Ter + +RETURN +go + +commit +go + + + +set xact_abort on +go + +begin transaction +go + +DELETE FROM dbo.TabTranPosizEventi WHERE CodEvento=N'SpeWipNoDe' and IdxPosizione=290 +DELETE FROM dbo.TabTranPosizEventi WHERE CodEvento=N'SpeWipOkDe' and IdxPosizione=295 +go + +commit transaction +go + +set xact_abort on +go + +begin transaction +go + +INSERT INTO dbo.AnagTipoEvento + VALUES (N'SpeWipTerz', N'Spedizione di materiale a terzisti') +DELETE FROM dbo.AnagTipoEvento WHERE CodEvento=N'SpeWipNoDe' +DELETE FROM dbo.AnagTipoEvento WHERE CodEvento=N'SpeWipOkDe' +go + +commit transaction +go + + +set xact_abort on +go + +begin transaction +go + +INSERT INTO dbo.TabTranPosizEventi + VALUES (N'SpeWipTerz', 290, 305) +INSERT INTO dbo.TabTranPosizEventi + VALUES (N'SpeWipTerz', 295, 300) +go + +commit transaction +go + + -- registro versione... diff --git a/GMW/GMW_data/bin/Release/GMW_data.dll b/GMW/GMW_data/bin/Release/GMW_data.dll index e6716cbe..ba76d6c9 100644 Binary files a/GMW/GMW_data/bin/Release/GMW_data.dll and b/GMW/GMW_data/bin/Release/GMW_data.dll differ diff --git a/GMW/GMW_data/bin/Release/SteamWare.dll b/GMW/GMW_data/bin/Release/SteamWare.dll index df0450e8..35a826d9 100644 Binary files a/GMW/GMW_data/bin/Release/SteamWare.dll and b/GMW/GMW_data/bin/Release/SteamWare.dll differ diff --git a/GMW/GMW_data/obj/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll index e6716cbe..ba76d6c9 100644 Binary files a/GMW/GMW_data/obj/Release/GMW_data.dll and b/GMW/GMW_data/obj/Release/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache index c450412a..bac873a4 100644 Binary files a/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll b/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll index d622a452..d20d50cb 100644 Binary files a/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/GMW/GMW_installer/Release/GMW_installer.msi b/GMW/GMW_installer/Release/GMW_installer.msi index edbd4f30..e425b18b 100644 Binary files a/GMW/GMW_installer/Release/GMW_installer.msi and b/GMW/GMW_installer/Release/GMW_installer.msi differ