diff --git a/GMW/GMW/WebUserControls/mod_chLang.ascx b/GMW/GMW/WebUserControls/mod_chLang.ascx index f3d2969a..b659973c 100644 --- a/GMW/GMW/WebUserControls/mod_chLang.ascx +++ b/GMW/GMW/WebUserControls/mod_chLang.ascx @@ -21,7 +21,7 @@ + SelectMethod="GetLingue" TypeName="GMW_data.selDataVoc"> diff --git a/GMW/GMW/WebUserControls/mod_selettore_ajax.ascx b/GMW/GMW/WebUserControls/mod_selettore_ajax.ascx index d472ec10..7d5310df 100644 --- a/GMW/GMW/WebUserControls/mod_selettore_ajax.ascx +++ b/GMW/GMW/WebUserControls/mod_selettore_ajax.ascx @@ -63,7 +63,7 @@    - diff --git a/GMW/GMW/WebUserControls/mod_vocabolario.ascx b/GMW/GMW/WebUserControls/mod_vocabolario.ascx index 75124fc7..ce4c26a4 100644 --- a/GMW/GMW/WebUserControls/mod_vocabolario.ascx +++ b/GMW/GMW/WebUserControls/mod_vocabolario.ascx @@ -71,7 +71,7 @@ - diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 6304d6bd..29064f25 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 ad90eccf..a9ea05fa 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 df0450e8..ba92c82c 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 6304d6bd..29064f25 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 d4670f97..2008c10b 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 ad1bca9b..f9eacd61 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 ad90eccf..052de84f 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 963ec1b8..ba92c82c 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/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index ad1bca9b..f9eacd61 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 6c85663b..ec108cef 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_WS/bin/GMW.dll b/GMW/GMW_WS/bin/GMW.dll index 82079854..907ef345 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 d4274361..3fe60e05 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 8672bb01..dcf5bbed 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 b9e8d620..03b76143 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/Debug/GMW_WS.dll b/GMW/GMW_WS/obj/Debug/GMW_WS.dll index 1dbfc5b1..3fe60e05 100644 Binary files a/GMW/GMW_WS/obj/Debug/GMW_WS.dll and b/GMW/GMW_WS/obj/Debug/GMW_WS.dll differ diff --git a/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache index 78990097..b11f7da1 100644 Binary files a/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_data/GMW_data.csproj b/GMW/GMW_data/GMW_data.csproj index 45fe3129..b6126bdd 100644 --- a/GMW/GMW_data/GMW_data.csproj +++ b/GMW/GMW_data/GMW_data.csproj @@ -85,6 +85,7 @@ Settings.settings + diff --git a/GMW/GMW_data/MagClass.cs b/GMW/GMW_data/MagClass.cs index 64ed2b00..e20202bd 100644 --- a/GMW/GMW_data/MagClass.cs +++ b/GMW/GMW_data/MagClass.cs @@ -929,6 +929,9 @@ namespace GMW_data * (quindi da codCella --> IdxCella --> spostamento * indico la lista come completata = 1 (true) * */ + // setup eventuali valori x rettifica + DS_magazzino.ElencoCartelliniRow rigaUdc; + bool fatto = false; esitoOperazione answ = esitoOperazione.errore; int trovate = 0; @@ -976,9 +979,30 @@ namespace GMW_data idxPosizUdcCorr = taElencoCartellini.getDetailsUdcByUdc(UDC)[0].IdxPosizione; idxPosizUdcDest = StateMachine.SM.getIdxPostizioneTo(CodEvento, idxPosizUdcCorr); // sposto UDC - scaricaUDC(UDC, idxCellaFrom, idxPosizUdcDest); + fatto = scaricaUDC(UDC, idxCellaFrom, idxPosizUdcDest); // dopo aver scaricato UDC sistemo eventuali Righe di Prelievo x lo stesso pending... magazzino.taRigheListePrelievo.stp_RLP_sbloccaNonPrelevate(CodLista, UDC); +#if false + // in caso di prelievo WIP da OVAS... + if (codTipoListaAttuale == "01-PreFus") + { + // e SE specificato nel web.config... + if (memLayer.ML.confReadBool("Cosumo84PostDelibera")) + { + // prendo i dati PRIMA che scarichi l'UDC... e con qta negativa xché qui devo "rimetterlo a posto"... + rigaUdc = taElencoCartellini.getDetailsUdcByUdc(UDC)[0]; + string Particolare = rigaUdc.Particolare; + int IdxPosizione = rigaUdc.IdxPosizione; + decimal Quantita = -rigaUdc.Qta; + // calcolo l'eventuale rettifica x AS + if (fatto) + { + // devo fare un movimento di compensazioen su mag 84 x non scaricare subito la quantità che ho appena messo in AS400... + DataProxy.obj.taCartellini.stp_rettMovAs400(Particolare, UDC, IdxPosizione.ToString(), Quantita); + } + } + } +#endif } // segna come scaricata la lista prelievo taElencoListePrelievo.updateStato(CodSoggetto, CodLista, (int)statoLista.scaricata); diff --git a/GMW/GMW_data/SqlScripts/GMW_00305.sql b/GMW/GMW_data/SqlScripts/GMW_00305.sql index c9526b44..278eff71 100644 --- a/GMW/GMW_data/SqlScripts/GMW_00305.sql +++ b/GMW/GMW_data/SqlScripts/GMW_00305.sql @@ -1,3 +1,201 @@ +set xact_abort on +go + +begin transaction +go + +set ANSI_NULLS on +go + +/*************************************** +* STORED stp_UDC_getByTipoDelibera +* +* elenco cartellini che possono essere oggetto della delibera indicata +* +* Steamware, S.E.L. +* mod: 2010.07.29 +* +****************************************/ +alter PROCEDURE stp_UDC_getByTipoDelibera +( + @CodTipoDelibera NVARCHAR(50), + @DataFrom DATETIME, + @DataTo DATETIME +) +AS + +SELECT * +FROM ElencoCartellini +WHERE IdxPosizione IN ( + SELECT TabTranPosizEventi.IdxPosizione + FROM TabTranPosizEventi INNER JOIN AnagTipoEvento ON TabTranPosizEventi.CodEvento = AnagTipoEvento.CodEvento + INNER JOIN AnagTipoDelibere ON AnagTipoEvento.CodEvento = AnagTipoDelibere.CodEvento + WHERE (AnagTipoDelibere.CodTipoDelibera = @CodTipoDelibera) + ) -- vincolo su posizioni accettabili + AND DataFus BETWEEN @DataFrom AND @DataTo -- vincolo data + AND UDC NOT IN ( SELECT DISTINCT UDC FROM PosizioneUdcCorrente) +ORDER BY UDC DESC + +RETURN +go + +/*************************************** +* STORED stp_UDC_update +* +* aggiorna un cartellino dato il suo codice UDC e tutti i parametri da aggiornare +* +* Steamware, S.E.L. +* mod: 2010.04.30 +* +****************************************/ +alter PROCEDURE stp_UDC_update +( + @UDC_edit VARCHAR(20), + @CodCS VARCHAR(2), + @Flusso VARCHAR(2), + @Anno VARCHAR(2), + @CodCliente VARCHAR(6), + @Particolare VARCHAR(15), + @CodImpianto AS VARCHAR(50), + @CodStampo VARCHAR(8), + @Esponente VARCHAR(6), + @Figura VARCHAR(4), + @DataFus DATETIME, + @TurnoFus INT, + @CodImballo VARCHAR(15), + @CodSoggetto VARCHAR(17), + @Tara FLOAT, + @IdxPosizione INT, + @CodTipoDichiaraz CHAR(1), + @CodEvento VARCHAR(10), + @Qta DECIMAL(10,2), + @PesoTot FLOAT, + @PesoCad FLOAT, + @CodStato VARCHAR(50), + @UDC_parent VARCHAR(20) +) +AS + +-- DECLARE iniziali +DECLARE @RagSociale AS VARCHAR(35) +DECLARE @DescParticolare AS VARCHAR(30) +DECLARE @DescImpianto AS VARCHAR(50) +DECLARE @DisegnoGrezzo AS VARCHAR(30) +DECLARE @NumCont AS INT +DECLARE @numFlu AS INT +DECLARE @numUdc AS INT +DECLARE @nextUdc AS INT + +------------------------------------------------------------------------------------------------------ +-- Caricamento Dati da anagrafica +------------------------------------------------------------------------------------------------------ +-- cerco la ragione sociale... +SET @RagSociale = ( + SELECT ISNULL(RagSociale, 'ND') AS RagSociale + FROM RilPro.AnagClienti + WHERE (CodCliente = @CodCliente) +) + +-- Cerco descrizione del particolare... +SET @DescParticolare = ( + SELECT ISNULL(DescParticolare, 'ND') AS DescParticolare + FROM RilPro.AnagParticolari + WHERE (Particolare = @Particolare) +) + +-- cerco codice disegno grezzo +SET @DisegnoGrezzo = ( + SELECT ISNULL(DisegnoGrezzo, 'ND') AS DescParticolare + FROM RilPro.AnagParticolari + WHERE (Particolare = @Particolare) +) + +-- cerco descrizione Impianto +SET @DescImpianto = ( + SELECT ISNULL(DescImpianto, 'ND') AS DescImpianto + FROM AnagImpianti + WHERE (CodImpianto = @CodImpianto) +) + + + +-- Calcolo contatore intero successivo x il contenitore... +SET @NumCont = ( + SELECT NumCont + FROM ElencoCartellini + WHERE (UDC = @UDC_edit) +) + + +------------------------------------------------------------------------------------------------------ + +------------------------------------------------------------------------------------------------------ +-- Flusso +------------------------------------------------------------------------------------------------------ +-- controllo se esiste il flusso (bilancia)... +SET @numFlu = ( + SELECT count(*) + FROM AnagBilance + WHERE CodBilancia = @Flusso +) +-- ...sennò lo creo... +IF(@numFlu = 0) + BEGIN + -- se c'è inserisco in tab + INSERT INTO AnagBilance(CodBilancia, DescrImpianto, CodCS) + VALUES (@Flusso, @Flusso, @CodCS) + END +------------------------------------------------------------------------------------------------------ + +------------------------------------------------------------------------------------------------------ +-- Ciclo principale x edit record +------------------------------------------------------------------------------------------------------ +BEGIN TRAN + /* + -- registro in StoricoCartellini + INSERT INTO StoricoCartellini(DataEv, CodEvento, CodTipoDichiaraz, UDC, CodCS,CodCliente, RagSociale, Particolare, DescParticolare, + DisegnoGrezzo, Esponente, CodImpianto, DescImpianto, CodStampo, Figura, DataFus, TurnoFus, CodImballo, CodSoggetto, + NumCont, Tara, Qta, CodStato, IdxPosizione, PesoTot, PesoCad) + SELECT GETDATE() AS DataEv, @CodEvento AS CodEvento, @CodTipoDichiaraz AS CodTipoDichiaraz, UDC, CodCS, + CodCliente, RagSociale, Particolare, DescParticolare, DisegnoGrezzo, Esponente, CodImpianto, DescImpianto, CodStampo, Figura, + DataFus, TurnoFus, CodImballo, @CodSoggetto AS CodSoggetto, NumCont, Tara, Qta, CodStato, IdxPosizione, PesoTot, PesoCad + FROM ElencoCartellini + WHERE (UDC = @UDC_edit) + */ + + -- elimino vecchio record parent/child + DELETE FROM RelazUDC + WHERE (UDC_child = @UDC_edit) + + -- modifico il record + UPDATE ElencoCartellini + SET CodCS = @CodCS, CodCliente = @CodCliente, RagSociale = @RagSociale, Particolare = @Particolare, DescParticolare = @DescParticolare, + DisegnoGrezzo = @DisegnoGrezzo, Esponente = @Esponente, CodImpianto = @CodImpianto, DescImpianto = @DescImpianto, CodStampo = @CodStampo, + Figura = @Figura, DataFus = @DataFus, TurnoFus = @TurnoFus, CodImballo = @CodImballo, CodSoggetto = @CodSoggetto, NumCont = @NumCont, + Tara = @Tara, Qta = @Qta, CodStato = @CodStato, IdxPosizione = @IdxPosizione, PesoTot = @PesoTot, PesoCad = @PesoCad, ModDate = GETDATE() + WHERE UDC = @UDC_edit + + -- inserisco relazione aprent-child tra UDC vecchio (tara) e nuovo (pesa) + INSERT INTO RelazUDC(UDC_parent, UDC_child) + VALUES (@UDC_parent, @UDC_edit) +COMMIT TRAN +------------------------------------------------------------------------------------------------------ + +------------------------------------------------------------------------------------------------------ +-- restituisco la tab dati con l'udc appena inserito +------------------------------------------------------------------------------------------------------ +SELECT * +FROM ElencoCartellini +WHERE UDC = @UDC_edit +------------------------------------------------------------------------------------------------------ + +RETURN +go + +commit +go + + diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index ad90eccf..a9ea05fa 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/bin/Debug/SteamWare.dll b/GMW/GMW_data/bin/Debug/SteamWare.dll index 03b76143..ba92c82c 100644 Binary files a/GMW/GMW_data/bin/Debug/SteamWare.dll and b/GMW/GMW_data/bin/Debug/SteamWare.dll differ diff --git a/GMW/GMW_data/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll index ad90eccf..a9ea05fa 100644 Binary files a/GMW/GMW_data/obj/Debug/GMW_data.dll and b/GMW/GMW_data/obj/Debug/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_data/obj/Debug/ResolveAssemblyReference.cache index 3badb4c9..22478140 100644 Binary files a/GMW/GMW_data/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_data/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_data/selData.cs b/GMW/GMW_data/selData.cs new file mode 100644 index 00000000..39a596d1 --- /dev/null +++ b/GMW/GMW_data/selData.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using SteamWare; + + +namespace GMW_data +{ + public class selData + { + /// + /// classe accesso tabelle selettori + /// + public selData() + { + } + + /// + /// tabella elenco UDC papabili x lista prelievo (da conditio = codice particolare...) + /// + /// + /// + public GMW_data.DS_Utility.v_selUdcByPartDataTable getSelUdcByPart() + { + string conditio = ""; + // cerco da rete se c'è la condizione di filtraggio... + try + { + conditio = SteamWare.memLayer.ML.StringSessionObj("UdcByPart_conditio"); + } + catch + { } + return GMW_data.utils.obj.taUdcByPart.getByConditio(conditio); + } + + } +} diff --git a/GMW/GMW_data/selDataVoc.cs b/GMW/GMW_data/selDataVoc.cs index f4ebb88b..3504a49e 100644 --- a/GMW/GMW_data/selDataVoc.cs +++ b/GMW/GMW_data/selDataVoc.cs @@ -34,24 +34,7 @@ public class selDataVoc return SteamWare.DataWrap.DW.taLingue.GetData(); } - /// - /// tabella elenco UDC papabili x lista prelievo (da conditio = codice particolare...) - /// - /// - /// - public GMW_data.DS_Utility.v_selUdcByPartDataTable getSelUdcByPart() - { - string conditio = ""; - // cerco da rete se c'è la condizione di filtraggio... - try - { - conditio = SteamWare.memLayer.ML.StringSessionObj("UdcByPart_conditio"); - } - catch - { } - return GMW_data.utils.obj.taUdcByPart.getByConditio(conditio); - } - + /// /// faccio update del lemma indicato... ///