diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index ca66ed1f..296bc657 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 397a17f6..8838deaa 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index ca66ed1f..296bc657 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/Debug/ResolveAssemblyReference.cache b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache index 9733abeb..19a9c4b1 100644 Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index 54e0cb1b..cad2b96e 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 d00ceb21..8838deaa 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/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index c593fa28..cad2b96e 100644 Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ diff --git a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache index 44e219de..c4d7b268 100644 Binary files a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_data/MagClass.cs b/GMW/GMW_data/MagClass.cs index d1e5e328..062965d3 100644 --- a/GMW/GMW_data/MagClass.cs +++ b/GMW/GMW_data/MagClass.cs @@ -1030,7 +1030,7 @@ namespace GMW_data taElencoListePrelievo.updateStato(CodSoggetto, CodLista, (int)statoLista.scaricata); // restituisce ok answ = esitoOperazione.ok; - // ora eseguo stored x copiare in altra tabella (quella per AS...) + // ora eseguo stored x copiare in altra tabella (quella per AS...) - SOLO SE NON E' prelievo fusi... taElencoListePrelievo.stp_LP_exportToAs400(CodLista); } // se è già completata dà errore diff --git a/GMW/GMW_data/SqlScripts/GMW_00325.sql b/GMW/GMW_data/SqlScripts/GMW_00325.sql new file mode 100644 index 00000000..18e40c89 --- /dev/null +++ b/GMW/GMW_data/SqlScripts/GMW_00325.sql @@ -0,0 +1,104 @@ +set xact_abort on +go + +begin transaction +go + +alter table TipoListaPrelievo add + toAs400 bit constraint DF_TipoListaPrelievo_toAs400 default (1) +go + +update TipoListaPrelievo set toAs400=1 +go + +set ANSI_NULLS on +go + +/*************************************** +* STORED stp_LP_exportToAs400 +* +* esporta la lista di prelievo (e le relative righe) verso AS400 andando a copaire nelle relative tabelle _AS +* +* Steamware, S.E.L. +* mod: 2010.07.19 +* +****************************************/ +alter PROCEDURE stp_LP_exportToAs400 +( + @CodLista NVARCHAR(12) +) +AS + +BEGIN TRAN + + -- inizio con un controllo se devo processare verso AS400 la lista di prelievo... + DECLARE @toAs400 BIT + SET @toAs400 = (SELECT ISNULL(tlp.toAs400, 0) as valore + FROM TipoListaPrelievo AS tlp INNER JOIN ElencoListePrelievo AS elp ON tlp.CodTipoLista = elp.CodTipoLista + WHERE (elp.CodLista = @CodLista) + ) + + IF(@toAs400 > 0) + BEGIN + -- copio la lista (intestazione) + INSERT INTO ElencoListePrelievo_AS(CodLista, CodTipoLista, CodCS, DataCreaz, CodCliente, RagSociale, CodSoggetto, Particolare, DescParticolare, + DisegnoGrezzo, Esponente, Figura, CodImballo, QtaTot, CodStatoLista, Destinatario) + SELECT CodLista, CodTipoLista, CodCS, DataCreaz, CodCliente, RagSociale, CodSoggetto, Particolare, DescParticolare, + DisegnoGrezzo, Esponente, Figura, CodImballo, QtaTot, CodStatoLista, Destinatario + FROM ElencoListePrelievo + WHERE (CodLista = @CodLista) + + -- copio le righe lista di dettaglio + INSERT INTO RigheListePrelievo_AS(CodLista, UDC, Qta, Proposto, Prelevato) + SELECT CodLista, UDC, Qta, Proposto, Prelevato + FROM RigheListePrelievo + WHERE (CodLista = @CodLista) AND Prelevato = 1 + + -- aggiorno le quantità passate ad AS... + UPDATE ElencoListePrelievo_AS + SET QtaTot = ( SELECT SUM(Qta) AS QtaTot FROM RigheListePrelievo WHERE (CodLista = @CodLista) AND Prelevato = 1 ) + WHERE (CodLista = @CodLista) + END + + +COMMIT TRAN + +-- IMPORTANTE: in caso siano rimasti riferimenti ad un UDC scaricato in AS in altre liste di prelievo li tolgo in modo da "ripulirle" ed evitare che lo stesso UDC venga prelevato 2 volte... +DELETE RLP +FROM RigheListePrelievo RLP +INNER JOIN ElencoListePrelievo ELP + ON RLP.CodLista = ELP.CodLista +WHERE ELP.CodStatoLista < 4 AND RLP.CodLista <> @CodLista AND RLP.UDC IN ( + SELECT UDC + FROM RigheListePrelievo + WHERE (CodLista = @CodLista) AND Prelevato = 1 + ) + +RETURN +go + +commit +go + + +set xact_abort on +go + +begin transaction +go + +UPDATE dbo.TipoListaPrelievo SET + toAs400=0 + WHERE CodTipoLista=N'01-PreFus' +go + +commit transaction +go + + + + + +-- registro versione... +INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(325, GETDATE()) +GO diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 397a17f6..8838deaa 100644 Binary files a/GMW/GMW_data/bin/Debug/GMW_data.dll and b/GMW/GMW_data/bin/Debug/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll index 397a17f6..8838deaa 100644 Binary files a/GMW/GMW_data/obj/Debug/GMW_data.dll and b/GMW/GMW_data/obj/Debug/GMW_data.dll differ