diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config index 3aede8ca..80f44bd4 100644 --- a/GMW/GMW/Web.config +++ b/GMW/GMW/Web.config @@ -17,6 +17,7 @@ + @@ -62,7 +63,7 @@ - + diff --git a/GMW/GMW/WebUserControls/mod_delibera.ascx.cs b/GMW/GMW/WebUserControls/mod_delibera.ascx.cs index 7a10524c..4554db8a 100644 --- a/GMW/GMW/WebUserControls/mod_delibera.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_delibera.ascx.cs @@ -79,8 +79,8 @@ namespace GMW.WebUserControls #region gestione eventi public event EventHandler eh_resetSelezione; - public event EventHandler eh_nuovoValore; - public event EventHandler eh_selValore; + //public event EventHandler eh_nuovoValore; + //public event EventHandler eh_selValore; #endregion diff --git a/GMW/GMW/WebUserControls/mod_detailParticolari.ascx.cs b/GMW/GMW/WebUserControls/mod_detailParticolari.ascx.cs index 1f3b5c16..a663daba 100644 --- a/GMW/GMW/WebUserControls/mod_detailParticolari.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_detailParticolari.ascx.cs @@ -80,7 +80,7 @@ namespace GMW.WebUserControls #region gestione eventi public event EventHandler eh_resetSelezione; - public event EventHandler eh_nuovoValore; + //public event EventHandler eh_nuovoValore; public event EventHandler eh_selValore; #endregion diff --git a/GMW/GMW/WebUserControls/mod_detailUDC.ascx.cs b/GMW/GMW/WebUserControls/mod_detailUDC.ascx.cs index ae9af0dd..d3b178b7 100644 --- a/GMW/GMW/WebUserControls/mod_detailUDC.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_detailUDC.ascx.cs @@ -40,9 +40,9 @@ namespace GMW.WebUserControls #region gestione eventi - public event EventHandler eh_resetSelezione; - public event EventHandler eh_nuovoValore; - public event EventHandler eh_selValore; + //public event EventHandler eh_resetSelezione; + //public event EventHandler eh_nuovoValore; + //public event EventHandler eh_selValore; #endregion @@ -102,7 +102,6 @@ namespace GMW.WebUserControls { if (detView.Rows.Count > 0) { - LinkButton lb; // aggiorno gli headers foreach (DetailsViewRow riga in detView.Rows) { diff --git a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs index ee979c27..c247b29f 100644 --- a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs @@ -215,9 +215,9 @@ namespace GMW.WebUserControls #region gestione eventi - public event EventHandler eh_resetSelezione; + //public event EventHandler eh_resetSelezione; public event EventHandler eh_nuovoValore; - public event EventHandler eh_selValore; + //public event EventHandler eh_selValore; #endregion diff --git a/GMW/GMW/WebUserControls/mod_listImballi.ascx.cs b/GMW/GMW/WebUserControls/mod_listImballi.ascx.cs index 77ea78d8..4d381ed5 100644 --- a/GMW/GMW/WebUserControls/mod_listImballi.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_listImballi.ascx.cs @@ -93,7 +93,7 @@ namespace GMW.WebUserControls #region gestione eventi public event EventHandler eh_resetSelezione; - public event EventHandler eh_nuovoValore; + //public event EventHandler eh_nuovoValore; public event EventHandler eh_selValore; #endregion diff --git a/GMW/GMW/WebUserControls/mod_listParticolari.ascx.cs b/GMW/GMW/WebUserControls/mod_listParticolari.ascx.cs index 48829d32..b6191ad1 100644 --- a/GMW/GMW/WebUserControls/mod_listParticolari.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_listParticolari.ascx.cs @@ -93,7 +93,7 @@ namespace GMW.WebUserControls #region gestione eventi public event EventHandler eh_resetSelezione; - public event EventHandler eh_nuovoValore; + //public event EventHandler eh_nuovoValore; public event EventHandler eh_selValore; #endregion diff --git a/GMW/GMW/WebUserControls/mod_listUDC.ascx.cs b/GMW/GMW/WebUserControls/mod_listUDC.ascx.cs index 3c689b60..0803ef4b 100644 --- a/GMW/GMW/WebUserControls/mod_listUDC.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_listUDC.ascx.cs @@ -79,7 +79,7 @@ namespace GMW.WebUserControls #region gestione eventi public event EventHandler eh_resetSelezione; - public event EventHandler eh_nuovoValore; + //public event EventHandler eh_nuovoValore; public event EventHandler eh_selValore; #endregion diff --git a/GMW/GMW/WebUserControls/mod_paretoPartByFullSpec.ascx.cs b/GMW/GMW/WebUserControls/mod_paretoPartByFullSpec.ascx.cs index 38ac8b2b..7aef05a8 100644 --- a/GMW/GMW/WebUserControls/mod_paretoPartByFullSpec.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_paretoPartByFullSpec.ascx.cs @@ -79,7 +79,7 @@ namespace GMW.WebUserControls #region gestione eventi public event EventHandler eh_resetSelezione; - public event EventHandler eh_nuovoValore; + //public event EventHandler eh_nuovoValore; public event EventHandler eh_selValore; #endregion diff --git a/GMW/GMW/WebUserControls/mod_paretoUdcBlocco.ascx.cs b/GMW/GMW/WebUserControls/mod_paretoUdcBlocco.ascx.cs index 706fe3ed..1fae586c 100644 --- a/GMW/GMW/WebUserControls/mod_paretoUdcBlocco.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_paretoUdcBlocco.ascx.cs @@ -79,7 +79,7 @@ namespace GMW.WebUserControls #region gestione eventi public event EventHandler eh_resetSelezione; - public event EventHandler eh_nuovoValore; + //public event EventHandler eh_nuovoValore; public event EventHandler eh_selValore; #endregion diff --git a/GMW/GMW/WebUserControls/mod_statoMag.ascx.cs b/GMW/GMW/WebUserControls/mod_statoMag.ascx.cs index 3b472f43..f8a9d598 100644 --- a/GMW/GMW/WebUserControls/mod_statoMag.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_statoMag.ascx.cs @@ -92,7 +92,7 @@ namespace GMW.WebUserControls #region gestione eventi public event EventHandler eh_resetSelezione; - public event EventHandler eh_nuovoValore; + //public event EventHandler eh_nuovoValore; public event EventHandler eh_selValore; #endregion diff --git a/GMW/GMW/WebUserControls/mod_statoMagLogico.ascx.cs b/GMW/GMW/WebUserControls/mod_statoMagLogico.ascx.cs index 0004074d..95fc8af3 100644 --- a/GMW/GMW/WebUserControls/mod_statoMagLogico.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_statoMagLogico.ascx.cs @@ -92,7 +92,7 @@ namespace GMW.WebUserControls #region gestione eventi public event EventHandler eh_resetSelezione; - public event EventHandler eh_nuovoValore; + //public event EventHandler eh_nuovoValore; public event EventHandler eh_selValore; #endregion diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 56f9a329..7e983dba 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 f5dae22f..8b007512 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 8d8b94dd..de0f194c 100644 Binary files a/GMW/GMW/bin/SteamWare.dll and b/GMW/GMW/bin/SteamWare.dll differ diff --git a/GMW/GMW/mazzAppSettings.config b/GMW/GMW/mazzAppSettings.config index b5f176a7..0bb68910 100644 --- a/GMW/GMW/mazzAppSettings.config +++ b/GMW/GMW/mazzAppSettings.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 56f9a329..0de26d1b 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 ecf233fc..a96659fb 100644 Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW/obj/Release/GMW.dll b/GMW/GMW/obj/Release/GMW.dll index b5bb031b..7e983dba 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 9bcc4b7f..b3c22079 100644 Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW/unauthorized.aspx.cs b/GMW/GMW/unauthorized.aspx.cs index d85d5814..ffab794d 100644 --- a/GMW/GMW/unauthorized.aspx.cs +++ b/GMW/GMW/unauthorized.aspx.cs @@ -8,11 +8,20 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; +using System.Threading; +using System.Security.Cryptography; public partial class unauthorized : System.Web.UI.Page { protected void Page_Load(object sender, EventArgs e) { + byte[] delay = new byte[1]; + RandomNumberGenerator prng = new RNGCryptoServiceProvider(); + prng.GetBytes(delay); + Thread.Sleep((int)delay[0]); + + IDisposable disposable = prng as IDisposable; + if (disposable != null) { disposable.Dispose(); } } } diff --git a/GMW/GMW_WS.sln b/GMW/GMW_WS.sln index 56e22b24..c995b488 100644 --- a/GMW/GMW_WS.sln +++ b/GMW/GMW_WS.sln @@ -88,7 +88,6 @@ Global {DC59354D-5107-4700-BC35-9E2C4DDEEFC7}.Release|Any CPU.ActiveCfg = Release|Any CPU {DC59354D-5107-4700-BC35-9E2C4DDEEFC7}.Release|Any CPU.Build.0 = Release|Any CPU {6A373C13-CA05-416C-B912-AE30A7EE11D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A373C13-CA05-416C-B912-AE30A7EE11D2}.Debug|Any CPU.Build.0 = Debug|Any CPU {6A373C13-CA05-416C-B912-AE30A7EE11D2}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU {6A373C13-CA05-416C-B912-AE30A7EE11D2}.Deploy|Any CPU.Build.0 = Debug|Any CPU {6A373C13-CA05-416C-B912-AE30A7EE11D2}.Installer_Offline|Any CPU.ActiveCfg = Release|Any CPU @@ -98,7 +97,6 @@ Global {6A373C13-CA05-416C-B912-AE30A7EE11D2}.Installer|Any CPU.ActiveCfg = Release|Any CPU {6A373C13-CA05-416C-B912-AE30A7EE11D2}.Installer|Any CPU.Build.0 = Release|Any CPU {6A373C13-CA05-416C-B912-AE30A7EE11D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A373C13-CA05-416C-B912-AE30A7EE11D2}.Release|Any CPU.Build.0 = Release|Any CPU {2A52769E-FB64-4B86-A2F0-973361357EA9}.Debug|Any CPU.ActiveCfg = Debug {2A52769E-FB64-4B86-A2F0-973361357EA9}.Deploy|Any CPU.ActiveCfg = Debug {2A52769E-FB64-4B86-A2F0-973361357EA9}.Installer_Offline|Any CPU.ActiveCfg = Release diff --git a/GMW/GMW_WS/GMW_WS.csproj.user b/GMW/GMW_WS/GMW_WS.csproj.user index 473ba2cb..8cf66141 100644 --- a/GMW/GMW_WS/GMW_WS.csproj.user +++ b/GMW/GMW_WS/GMW_WS.csproj.user @@ -3,9 +3,8 @@ - - - CurrentPage + bilance.asmx + SpecificPage True False False diff --git a/GMW/GMW_WS/Web.config b/GMW/GMW_WS/Web.config index b65b54b6..f0ee1f7d 100644 --- a/GMW/GMW_WS/Web.config +++ b/GMW/GMW_WS/Web.config @@ -88,7 +88,7 @@ - + diff --git a/GMW/GMW_WS/bilance.asmx.cs b/GMW/GMW_WS/bilance.asmx.cs index 03ae57e9..21c24c68 100644 --- a/GMW/GMW_WS/bilance.asmx.cs +++ b/GMW/GMW_WS/bilance.asmx.cs @@ -263,7 +263,7 @@ namespace GMW_WS #endregion - #region gestione UDC: creazione ed editing + #region gestione UDC: creazione /// /// Fornisce un nuovo codice UDC tipo TARA a partire dalla richiesta e salva i dati @@ -300,6 +300,9 @@ namespace GMW_WS // output risultato return answ; } + + // metodi SENZA specifica cod magazzino... +#if false /// /// Fornisce un nuovo codice UDC tipo completo (con pezzi) a partire dalla richiesta e salva i dati /// @@ -440,6 +443,127 @@ namespace GMW_WS } int IdxPosizione = memLayer.ML.confReadInt("IdxPosNewWip"); // creo nuovo cartellino! + DS_Applicazione.ElencoCartelliniDataTable tabUdc = DataProxy.obj.taCartellini.stp_insNewFull(CodCS, CodBilancia, string.Format("{0:yy}", DateTime.Now), CodCliente, Particolare, CodImpianto, CodStampo, Esponente, Figura, DataRif, TurnoRif, CodImballo, CodSoggetto, Tara, IdxPosizione, CodTipoDichiarazione, "UDC_WIP", Quantita, PesoTot, PesoCad, CodStato, UDC_Parent); // ATTENZIONE: "UDC_WIP" è "hard coded" nel db... !!! + // leggo la riga + try + { + answ = tabUdc[0].UDC; + // salvo associazioen parent-child tra UDC! + DataProxy.obj.taRelazUDC.Insert(UDC_Parent, answ); + } + catch + { } + return answ; + } +#endif + + /// + /// Fornisce un nuovo codice UDC tipo completo (con pezzi e cod magazzino) a partire dalla richiesta e salva i dati + /// + /// codice anagrafico della bilanca che effettua la richiesta (codice della pesa) + /// codice anagrafico del cliente + /// codice del particolare (articolo) - da anagrafica! + /// Codice dell'impianto + /// Codice dello stampo + /// codice dell'esponente dello stampo + /// Codice figura + /// Data di rif per la dichiarazione + /// Turno di rif per la dichiarazione + /// codice dell'imballo (tipo cassone) - string LIBERO (non facciamo controlli in input) + /// codice dell'operatore + /// codice dell'UDC parent (UDC della tara) + /// peso in kg (0 se non noto) da associare all'UDC come tara del contenitore + /// tipo di dichiarazione (vedere relativa anagrafica consentita, es U=uomo, M=macchina...) + /// numero pezzi associati all'UDC + /// Peso totale rilevato + /// Peso unitario rilevato + /// Codice dello stato del pezzo (da anagrafica: sabbiato, ...) + /// Codice INT del magazzino in cui inserire l'UDC + /// UDC del nuovo cartellino + [WebMethod(Description = "Fornisce un nuovo codice UDC tipo completo (con pezzi e cod magazzino) a partire dalla richiesta e salva i dati")] + public string UdcCall_GetNew_Pesa(string CodBilancia, string CodCliente, string Particolare, string CodImpianto, string CodStampo, string Esponente, string Figura, string UDC_Parent, double Tara, string CodImballo, string CodTipoDichiarazione, string CodSoggetto, int Quantita, float PesoTot, float PesoCad, DateTime DataRif, int TurnoRif, string CodStato, int CodMag) + { + // ricavo cod company... + string CodCS = "ND"; + string answ = "NA"; + try + { + CodCS = DataProxy.obj.taAnagBil.stp_getByCodBilancia(CodBilancia)[0].CodCS; + } + catch + { + CodCS = memLayer.ML.confReadString("CodCS"); + } + int IdxPosizione = 0; + if (CodMag > 0) + { + IdxPosizione = CodMag; + } + else + { + IdxPosizione = memLayer.ML.confReadInt("IdxPosNewFusi"); + } + // creo nuovo cartellino! + DS_Applicazione.ElencoCartelliniDataTable tabUdc = DataProxy.obj.taCartellini.stp_insNewFull(CodCS, CodBilancia, string.Format("{0:yy}", DateTime.Now), CodCliente, Particolare, CodImpianto, CodStampo, Esponente, Figura, DataRif, TurnoRif, CodImballo, CodSoggetto, Tara, IdxPosizione, CodTipoDichiarazione, "UDC_PESA", Quantita, PesoTot, PesoCad, CodStato, UDC_Parent); // ATTENZIONE: "UDC_PESA" è "hard coded" nel db... !!! + // leggo la riga + try + { + answ = tabUdc[0].UDC; + // salvo associazioen parent-child tra UDC! + DataProxy.obj.taRelazUDC.Insert(UDC_Parent, answ); + } + catch + { } + return answ; + } + + /// + /// Fornisce un nuovo codice UDC FINITI tipo completo (con pezzi e cod magazzino) a partire dalla richiesta e salva i dati + /// + /// codice anagrafico della bilanca che effettua la richiesta (codice della pesa) + /// codice anagrafico del cliente + /// codice del particolare (articolo) - da anagrafica! + /// Codice dell'impianto + /// Codice dello stampo + /// codice dell'esponente dello stampo + /// Codice figura + /// Data di rif per la dichiarazione + /// Turno di rif per la dichiarazione + /// codice dell'imballo (tipo cassone) - string LIBERO (non facciamo controlli in input) + /// codice dell'operatore + /// codice dell'UDC parent (UDC della tara) + /// peso in kg (0 se non noto) da associare all'UDC come tara del contenitore + /// tipo di dichiarazione (vedere relativa anagrafica consentita, es U=uomo, M=macchina...) + /// numero pezzi associati all'UDC + /// Peso totale rilevato + /// Peso unitario rilevato + /// Codice dello stato del pezzo (da anagrafica: sabbiato, ...) + /// Codice INT del magazzino in cui inserire l'UDC + /// UDC del nuovo cartellino per FINITI + [WebMethod(Description = "Fornisce un nuovo codice UDC FINITI tipo completo (con pezzi e cod magazzino) a partire dalla richiesta e salva i dati")] + public string UdcCall_GetNew_Finito(string CodBilancia, string CodCliente, string Particolare, string CodImpianto, string CodStampo, string Esponente, string Figura, string UDC_Parent, double Tara, string CodImballo, string CodTipoDichiarazione, string CodSoggetto, int Quantita, float PesoTot, float PesoCad, DateTime DataRif, int TurnoRif, string CodStato, int CodMag) + { + // ricavo cod company... + string CodCS = "ND"; + string answ = "NA"; + try + { + CodCS = DataProxy.obj.taAnagBil.stp_getByCodBilancia(CodBilancia)[0].CodCS; + } + catch + { + CodCS = memLayer.ML.confReadString("CodCS"); + } + int IdxPosizione = 0; + if (CodMag > 0) + { + IdxPosizione = CodMag; + } + else + { + IdxPosizione = memLayer.ML.confReadInt("IdxPosNewFinito"); + } + // creo nuovo cartellino! DS_Applicazione.ElencoCartelliniDataTable tabUdc = DataProxy.obj.taCartellini.stp_insNewFull(CodCS, CodBilancia, string.Format("{0:yy}", DateTime.Now), CodCliente, Particolare, CodImpianto, CodStampo, Esponente, Figura, DataRif, TurnoRif, CodImballo, CodSoggetto, Tara, IdxPosizione, CodTipoDichiarazione, "UDC_FINITO", Quantita, PesoTot, PesoCad, CodStato, UDC_Parent); // ATTENZIONE: "UDC_FINITO" è "hard coded" nel db... !!! // leggo la riga try @@ -453,6 +577,69 @@ namespace GMW_WS return answ; } + /// + /// Fornisce un nuovo codice UDC WIP tipo completo (con pezzi e cod magazzino) a partire dalla richiesta e salva i dati + /// + /// codice anagrafico della bilanca che effettua la richiesta (codice della pesa) + /// codice anagrafico del cliente + /// codice del particolare (articolo) - da anagrafica! + /// Codice dell'impianto + /// Codice dello stampo + /// codice dell'esponente dello stampo + /// Codice figura + /// Data di rif per la dichiarazione + /// Turno di rif per la dichiarazione + /// codice dell'imballo (tipo cassone) - string LIBERO (non facciamo controlli in input) + /// codice dell'operatore + /// codice dell'UDC parent (UDC della tara) + /// peso in kg (0 se non noto) da associare all'UDC come tara del contenitore + /// tipo di dichiarazione (vedere relativa anagrafica consentita, es U=uomo, M=macchina...) + /// numero pezzi associati all'UDC + /// Peso totale rilevato + /// Peso unitario rilevato + /// Codice dello stato del pezzo (da anagrafica: sabbiato, ...) + /// Codice INT del magazzino in cui inserire l'UDC + /// UDC del nuovo cartellino per FINITI + [WebMethod(Description = "Fornisce un nuovo codice UDC WIP tipo completo (con pezzi e cod magazzino) a partire dalla richiesta e salva i dati")] + public string UdcCall_GetNew_WIP(string CodBilancia, string CodCliente, string Particolare, string CodImpianto, string CodStampo, string Esponente, string Figura, string UDC_Parent, double Tara, string CodImballo, string CodTipoDichiarazione, string CodSoggetto, int Quantita, float PesoTot, float PesoCad, DateTime DataRif, int TurnoRif, string CodStato, int CodMag) + { + // ricavo cod company... + string CodCS = "ND"; + string answ = "NA"; + try + { + CodCS = DataProxy.obj.taAnagBil.stp_getByCodBilancia(CodBilancia)[0].CodCS; + } + catch + { + CodCS = memLayer.ML.confReadString("CodCS"); + } + int IdxPosizione = 0; + if (CodMag > 0) + { + IdxPosizione = CodMag; + } + else + { + IdxPosizione = memLayer.ML.confReadInt("IdxPosNewWip"); + } + // creo nuovo cartellino! + DS_Applicazione.ElencoCartelliniDataTable tabUdc = DataProxy.obj.taCartellini.stp_insNewFull(CodCS, CodBilancia, string.Format("{0:yy}", DateTime.Now), CodCliente, Particolare, CodImpianto, CodStampo, Esponente, Figura, DataRif, TurnoRif, CodImballo, CodSoggetto, Tara, IdxPosizione, CodTipoDichiarazione, "UDC_WIP", Quantita, PesoTot, PesoCad, CodStato, UDC_Parent); // ATTENZIONE: "UDC_WIP" è "hard coded" nel db... !!! + // leggo la riga + try + { + answ = tabUdc[0].UDC; + // salvo associazioen parent-child tra UDC! + DataProxy.obj.taRelazUDC.Insert(UDC_Parent, answ); + } + catch + { } + return answ; + } + + #endregion + + #region gestione UDC: editing /// /// Associa 2 UDC di cui uno è stato consumato ed uno è quello nuovo creato a partire dal primo diff --git a/GMW/GMW_WS/bin/GMW.dll b/GMW/GMW_WS/bin/GMW.dll index 56f9a329..7e983dba 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 71153299..75b34644 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 f5dae22f..8b007512 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 8d8b94dd..de0f194c 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/mazzAppSettings.config b/GMW/GMW_WS/mazzAppSettings.config index 15fe63c3..fda53bce 100644 --- a/GMW/GMW_WS/mazzAppSettings.config +++ b/GMW/GMW_WS/mazzAppSettings.config @@ -6,7 +6,7 @@ - + diff --git a/GMW/GMW_WS/obj/Debug/GMW_WS.csproj.FileListAbsolute.txt b/GMW/GMW_WS/obj/Debug/GMW_WS.csproj.FileListAbsolute.txt index b13c5b5b..0660c5d8 100644 --- a/GMW/GMW_WS/obj/Debug/GMW_WS.csproj.FileListAbsolute.txt +++ b/GMW/GMW_WS/obj/Debug/GMW_WS.csproj.FileListAbsolute.txt @@ -31,38 +31,6 @@ C:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\zh-CHS\Aja C:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\zh-CHT\AjaxControlToolkit.resources.dll C:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\obj\Debug\GMW_WS.dll C:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\obj\Debug\GMW_WS.pdb -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\GMW_WS.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\GMW_WS.pdb -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\GMW.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\GMW_data.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\SteamWare.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\System.Web.Ajax.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\AjaxControlToolkit.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\ICSharpCode.SharpZipLib.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\System.Web.Ajax.pdb -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\AjaxControlToolkit.pdb -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\GMW_data.pdb -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\SteamWare.pdb -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\SteamWare.xml -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\GMW.pdb -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\ar\AjaxControlToolkit.resources.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\cs\AjaxControlToolkit.resources.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\de\AjaxControlToolkit.resources.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\es\AjaxControlToolkit.resources.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\fr\AjaxControlToolkit.resources.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\he\AjaxControlToolkit.resources.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\hi\AjaxControlToolkit.resources.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\it\AjaxControlToolkit.resources.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\ja\AjaxControlToolkit.resources.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\ko\AjaxControlToolkit.resources.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\nl\AjaxControlToolkit.resources.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\pt\AjaxControlToolkit.resources.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\ru\AjaxControlToolkit.resources.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\tr-TR\AjaxControlToolkit.resources.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\zh-CHS\AjaxControlToolkit.resources.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\bin\zh-CHT\AjaxControlToolkit.resources.dll c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\obj\Debug\ResolveAssemblyReference.cache c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\obj\Debug\RdlCompile.cache c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\obj\Debug\RdlCompile.compiled -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\obj\Debug\GMW_WS.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_WS\obj\Debug\GMW_WS.pdb diff --git a/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache index 66a72824..27e1ea67 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_WS/obj/Debug/build.force b/GMW/GMW_WS/obj/Debug/build.force new file mode 100644 index 00000000..e69de29b diff --git a/GMW/GMW_WS/obj/Release/GMW_WS.dll b/GMW/GMW_WS/obj/Release/GMW_WS.dll index 73dbe3aa..75b34644 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 14a52f20..42bb8f8d 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/GMW_WS_installer.vdproj b/GMW/GMW_WS_installer/GMW_WS_installer.vdproj index ccb4e165..4397a12a 100644 --- a/GMW/GMW_WS_installer/GMW_WS_installer.vdproj +++ b/GMW/GMW_WS_installer/GMW_WS_installer.vdproj @@ -344,14 +344,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW_WS" - "ProductCode" = "8:{0756C665-E00A-4321-B1A4-C397F67D9DBB}" - "PackageCode" = "8:{193204CD-201A-4879-A948-40E3D44A76B3}" + "ProductCode" = "8:{A4572EF5-3212-46A5-A1BC-634A167899C5}" + "PackageCode" = "8:{A71798AC-9693-46FD-A392-7E607C1E0A2F}" "UpgradeCode" = "8:{BA470335-3D4B-4C20-8152-90A5F0F14FE0}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.250" + "ProductVersion" = "8:1.0.255" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" @@ -824,7 +824,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C1E28C0CBEB3498E83D9B97B28568D55" { - "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe" + "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B61BA0CAC3474474B971A8F12A1C93F2" @@ -852,7 +852,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D67ABEB91C7F428EB3C512E4A505628A" { - "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe" + "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B61BA0CAC3474474B971A8F12A1C93F2" diff --git a/GMW/GMW_data/DS_Applicazione.Designer.cs b/GMW/GMW_data/DS_Applicazione.Designer.cs index c5435c84..d1022b84 100644 --- a/GMW/GMW_data/DS_Applicazione.Designer.cs +++ b/GMW/GMW_data/DS_Applicazione.Designer.cs @@ -12466,7 +12466,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[7]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[8]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, DisegnoGrezzo, Esponente, CodImpianto, DescImpianto, CodStampo, Figura, DataFus, TurnoFus, CodImballo, CodSoggetto, NumCont, Tara, Qta, CodStato, IdxPosizione, PesoTot, PesoCad, CreateDate, ModDate FROM dbo.ElencoCartellini"; @@ -12526,39 +12526,47 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC_parent", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[5].Connection = this.Connection; - this._commandCollection[5].CommandText = "dbo.stp_sbloccaUdc"; + this._commandCollection[5].CommandText = "dbo.stp_rettMovAs400"; this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.VarChar, 16, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Particolare", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodMagAS", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Qta", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 10, 2, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[6].Connection = this.Connection; - this._commandCollection[6].CommandText = "dbo.stp_UDC_update"; + this._commandCollection[6].CommandText = "dbo.stp_sbloccaUdc"; this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC_edit", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCS", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Flusso", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Anno", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCliente", global::System.Data.SqlDbType.VarChar, 6, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Particolare", global::System.Data.SqlDbType.VarChar, 15, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodImpianto", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodStampo", global::System.Data.SqlDbType.VarChar, 8, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Esponente", global::System.Data.SqlDbType.VarChar, 6, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Figura", global::System.Data.SqlDbType.VarChar, 4, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataFus", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TurnoFus", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodImballo", global::System.Data.SqlDbType.VarChar, 15, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.VarChar, 16, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Tara", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxPosizione", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodTipoDichiaraz", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodEvento", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Qta", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 10, 2, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PesoTot", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PesoCad", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodStato", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC_parent", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[7].Connection = this.Connection; + this._commandCollection[7].CommandText = "dbo.stp_UDC_update"; + this._commandCollection[7].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC_edit", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCS", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Flusso", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Anno", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCliente", global::System.Data.SqlDbType.VarChar, 6, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Particolare", global::System.Data.SqlDbType.VarChar, 15, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodImpianto", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodStampo", global::System.Data.SqlDbType.VarChar, 8, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Esponente", global::System.Data.SqlDbType.VarChar, 6, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Figura", global::System.Data.SqlDbType.VarChar, 4, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataFus", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TurnoFus", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodImballo", global::System.Data.SqlDbType.VarChar, 15, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.VarChar, 16, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Tara", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxPosizione", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodTipoDichiaraz", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodEvento", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Qta", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 10, 2, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PesoTot", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PesoCad", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodStato", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC_parent", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -12848,7 +12856,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno global::System.Nullable PesoCad, string CodStato, string UDC_parent) { - this.Adapter.SelectCommand = this.CommandCollection[6]; + this.Adapter.SelectCommand = this.CommandCollection[7]; if ((UDC_edit == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -13964,8 +13972,47 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int stp_sbloccaUdc(string UDC, string CodSoggetto) { + public virtual int stp_rettMovAs400(string Particolare, string CodMagAS, global::System.Nullable Qta) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; + if ((Particolare == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(Particolare)); + } + if ((CodMagAS == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(CodMagAS)); + } + if ((Qta.HasValue == true)) { + command.Parameters[3].Value = ((decimal)(Qta.Value)); + } + else { + command.Parameters[3].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int stp_sbloccaUdc(string UDC, string CodSoggetto) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; if ((UDC == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } diff --git a/GMW/GMW_data/DS_Applicazione.xsd b/GMW/GMW_data/DS_Applicazione.xsd index 145c4217..27425d74 100644 --- a/GMW/GMW_data/DS_Applicazione.xsd +++ b/GMW/GMW_data/DS_Applicazione.xsd @@ -755,6 +755,19 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno + + + + dbo.stp_rettMovAs400 + + + + + + + + + @@ -1363,8 +1376,8 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - - + + @@ -1377,14 +1390,14 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + @@ -1397,14 +1410,14 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + @@ -1417,14 +1430,14 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + @@ -1437,35 +1450,35 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - + - + - + @@ -1478,35 +1491,35 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - + - + - + @@ -1519,21 +1532,21 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - + @@ -1546,128 +1559,128 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - - - - + + + + - - - - - + + + + + - + @@ -1694,96 +1707,96 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - - - + + + - - - - + + + + - + - + - + - + - + - + - + - + - + @@ -1865,14 +1878,14 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + @@ -1885,157 +1898,157 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - - - - + + + + - - - - - - + + + + + + - + - + - + - + - + @@ -2048,42 +2061,42 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - + - + - + - + @@ -2096,14 +2109,14 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + @@ -2116,21 +2129,21 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - + diff --git a/GMW/GMW_data/DS_Applicazione.xss b/GMW/GMW_data/DS_Applicazione.xss index 742fb969..9943ef25 100644 --- a/GMW/GMW_data/DS_Applicazione.xss +++ b/GMW/GMW_data/DS_Applicazione.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -13,7 +13,7 @@ - + diff --git a/GMW/GMW_data/DS_Utility.xsd b/GMW/GMW_data/DS_Utility.xsd index c20bdca5..f7eb978e 100644 --- a/GMW/GMW_data/DS_Utility.xsd +++ b/GMW/GMW_data/DS_Utility.xsd @@ -468,21 +468,21 @@ WHERE (conditio = @conditio) - + - + - + @@ -495,22 +495,22 @@ WHERE (conditio = @conditio) - - + + - + - + @@ -523,35 +523,15 @@ WHERE (conditio = @conditio) - - + + - - - - - - - - - - - - - - - - - - - - - + @@ -565,21 +545,41 @@ WHERE (conditio = @conditio) - + + + + + + + - + + + + + + + + + + + + + + + - + @@ -592,29 +592,29 @@ WHERE (conditio = @conditio) - - + + - + - + - + @@ -627,8 +627,8 @@ WHERE (conditio = @conditio) - - + + @@ -641,14 +641,14 @@ WHERE (conditio = @conditio) - + - + @@ -661,21 +661,21 @@ WHERE (conditio = @conditio) - + - + - + @@ -688,14 +688,14 @@ WHERE (conditio = @conditio) - + - + @@ -708,7 +708,7 @@ WHERE (conditio = @conditio) - + @@ -721,40 +721,13 @@ WHERE (conditio = @conditio) - + - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -762,7 +735,34 @@ WHERE (conditio = @conditio) - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GMW/GMW_data/GMW_data.csproj b/GMW/GMW_data/GMW_data.csproj index 16cd4a1f..f9e783fe 100644 --- a/GMW/GMW_data/GMW_data.csproj +++ b/GMW/GMW_data/GMW_data.csproj @@ -160,6 +160,7 @@ SettingsSingleFileGenerator Settings.Designer.cs + diff --git a/GMW/GMW_data/SqlScripts/GMW_00255.sql b/GMW/GMW_data/SqlScripts/GMW_00255.sql new file mode 100644 index 00000000..2592f129 --- /dev/null +++ b/GMW/GMW_data/SqlScripts/GMW_00255.sql @@ -0,0 +1,32 @@ +-- update permessi x magazzino logico + + +--- nuovi eventi x gestione triggers variazioni quantità magazzino AS +set xact_abort on +go + +begin transaction +go + +INSERT INTO dbo.AnagTipoEvento + VALUES (N'UDC_DEL', N'Eliminato un UDC (per movimento AS400)') +INSERT INTO dbo.AnagTipoEvento + VALUES (N'UDC_MOV', N'Movimentazione contabile tra magazzini UDC') +INSERT INTO dbo.AnagTipoEvento + VALUES (N'UDC_NEW', N'Creato un nuovo UDC (per movimento AS400)') +INSERT INTO dbo.AnagTipoEvento + VALUES (N'UDC_NOQTY', N'Rettifica qta UDC creato se già in AS') +INSERT INTO dbo.AnagTipoEvento + VALUES (N'UDC_POS', N'Spostamento posizilne logica UDC') +go + +commit transaction +go + + + + + +-- registro versione... +INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(255, GETDATE()) +GO \ No newline at end of file diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index f5dae22f..758443c2 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 8d8b94dd..4f6c4f69 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/bin/Release/GMW_data.dll b/GMW/GMW_data/bin/Release/GMW_data.dll index 3afb63eb..8b007512 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/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll index f5dae22f..758443c2 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 830a4c57..f972974e 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/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll index 805029a8..251b04de 100644 Binary files a/GMW/GMW_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/GMW/GMW_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/GMW/GMW_data/obj/Debug/TempPE/DS_Utility.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_Utility.Designer.cs.dll index 440f7766..e8dcc8aa 100644 Binary files a/GMW/GMW_data/obj/Debug/TempPE/DS_Utility.Designer.cs.dll and b/GMW/GMW_data/obj/Debug/TempPE/DS_Utility.Designer.cs.dll differ diff --git a/GMW/GMW_data/obj/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll index 3afb63eb..8b007512 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/TempPE/DS_Applicazione.Designer.cs.dll b/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll index 310fdf1c..7bfb4afc 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