diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config index cee0068f..19f692b3 100644 --- a/GMW/GMW/Web.config +++ b/GMW/GMW/Web.config @@ -60,7 +60,7 @@ - + diff --git a/GMW/GMW/Web.config.GMW b/GMW/GMW/Web.config.GMW index 61207d51..48d5812f 100644 --- a/GMW/GMW/Web.config.GMW +++ b/GMW/GMW/Web.config.GMW @@ -60,7 +60,7 @@ - + diff --git a/GMW/GMW/Web.config.SP_test b/GMW/GMW/Web.config.SP_test index 619aba3e..7b71d754 100644 --- a/GMW/GMW/Web.config.SP_test +++ b/GMW/GMW/Web.config.SP_test @@ -60,7 +60,7 @@ - + diff --git a/GMW/GMW/Web.config.TK_test b/GMW/GMW/Web.config.TK_test index 00382655..89cda632 100644 --- a/GMW/GMW/Web.config.TK_test +++ b/GMW/GMW/Web.config.TK_test @@ -60,7 +60,7 @@ - + diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 3d9a0ff1..9eb3508a 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 941b47bf..e5eb1365 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/mazzAppSettings.config b/GMW/GMW/mazzAppSettings.config index a998ccda..fed351c1 100644 --- a/GMW/GMW/mazzAppSettings.config +++ b/GMW/GMW/mazzAppSettings.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW/mazzAppSettingsSP.config b/GMW/GMW/mazzAppSettingsSP.config index a1fb508a..d9903620 100644 --- a/GMW/GMW/mazzAppSettingsSP.config +++ b/GMW/GMW/mazzAppSettingsSP.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW/mazzAppSettingsSP_test.config b/GMW/GMW/mazzAppSettingsSP_test.config index a998ccda..fed351c1 100644 --- a/GMW/GMW/mazzAppSettingsSP_test.config +++ b/GMW/GMW/mazzAppSettingsSP_test.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW/mazzAppSettingsTK.config b/GMW/GMW/mazzAppSettingsTK.config index 11f0989c..e6f1665e 100644 --- a/GMW/GMW/mazzAppSettingsTK.config +++ b/GMW/GMW/mazzAppSettingsTK.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW/mazzAppSettingsTK_test.config b/GMW/GMW/mazzAppSettingsTK_test.config index f780dd35..63c075ef 100644 --- a/GMW/GMW/mazzAppSettingsTK_test.config +++ b/GMW/GMW/mazzAppSettingsTK_test.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW/obj/Release/GMW.dll b/GMW/GMW/obj/Release/GMW.dll index 503a4a7f..1e0a3d27 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 3f515751..4f15b32b 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/WebUserControls/mod_execUdc.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx.cs index 27519c05..82d0f469 100644 --- a/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx.cs @@ -264,13 +264,17 @@ namespace GMW_Term.WebUserControls /// private void depositaUdc(bool setCellaPiena) { - // cerco id della cella... - int idxCella = MagClass.magazzino.IdxCellaByCodCella(_CodCS, valoreScanUdc); - // salva le info facendo caricamento - MagClass.magazzino.spostaUDC(_CodCS, _UDC, idxCella, memLayer.ML.confReadBool("spostaUdcResettaLdp"), Request.UserHostName); - if (setCellaPiena) + // controllo UDC sia spostabile (ovvero NON in RLP bloccata) + if (MagClass.magazzino.checkUDC_mov(_UDC)) { - MagClass.magazzino.taCelle.stp_celle_updPiena(idxCella, true); + // cerco id della cella... + int idxCella = MagClass.magazzino.IdxCellaByCodCella(_CodCS, valoreScanUdc); + // salva le info facendo caricamento + MagClass.magazzino.spostaUDC(_CodCS, _UDC, idxCella, memLayer.ML.confReadBool("spostaUdcResettaLdp"), Request.UserHostName); + if (setCellaPiena) + { + MagClass.magazzino.taCelle.stp_celle_updPiena(idxCella, true); + } } // resetto buttons mod_btnUdc1.doReset(); @@ -283,18 +287,22 @@ namespace GMW_Term.WebUserControls /// private void spostaUdc(bool setCellaPiena) { - // cerco id delle celle... - int idxCellaFrom = MagClass.magazzino.taDettUDC.getByFullUdc(_UDC, _CodCS)[0].IdxCella; - int idxCellaTo = MagClass.magazzino.IdxCellaByCodCella(_CodCS, valoreScanUdc); - // salva le info facendo caricamento - MagClass.magazzino.spostaUDC(_CodCS, _UDC, idxCellaTo, memLayer.ML.confReadBool("spostaUdcResettaLdp"), Request.UserHostName); - // dopo aver spostato UDC sistemo eventuali Righe di Prelievo x lo stesso UDC pending... - MagClass.magazzino.taRigheListePrelievo.stp_RLP_sbloccaNonPrelevate("ND", _UDC); // metto "ND" perché voglio sbloccare tutti gli impieghi di quell'UDC - // la cella di partenza la indico come disponibile (comunque ho tolto un UDC...) - MagClass.magazzino.taCelle.stp_celle_updPiena(idxCellaFrom, false); - if (setCellaPiena) + // controllo UDC sia spostabile (ovvero NON in RLP bloccata) + if (MagClass.magazzino.checkUDC_mov(_UDC)) { - MagClass.magazzino.taCelle.stp_celle_updPiena(idxCellaTo, true); + // cerco id delle celle... + int idxCellaFrom = MagClass.magazzino.taDettUDC.getByFullUdc(_UDC, _CodCS)[0].IdxCella; + int idxCellaTo = MagClass.magazzino.IdxCellaByCodCella(_CodCS, valoreScanUdc); + // salva le info facendo caricamento + MagClass.magazzino.spostaUDC(_CodCS, _UDC, idxCellaTo, memLayer.ML.confReadBool("spostaUdcResettaLdp"), Request.UserHostName); + // dopo aver spostato UDC sistemo eventuali Righe di Prelievo x lo stesso UDC pending... + MagClass.magazzino.taRigheListePrelievo.stp_RLP_sbloccaNonPrelevate("ND", _UDC); // metto "ND" perché voglio sbloccare tutti gli impieghi di quell'UDC + // la cella di partenza la indico come disponibile (comunque ho tolto un UDC...) + MagClass.magazzino.taCelle.stp_celle_updPiena(idxCellaFrom, false); + if (setCellaPiena) + { + MagClass.magazzino.taCelle.stp_celle_updPiena(idxCellaTo, true); + } } // resetto buttons mod_btnUdc1.doReset(); @@ -346,12 +354,16 @@ namespace GMW_Term.WebUserControls /// protected void ods_Updating(object sender, ObjectDataSourceMethodEventArgs e) { - decimal qta = Convert.ToDecimal(e.InputParameters["Qta"]); - // intercetto l'evento e chiamo una stored ad hoc! - MagClass.magazzino.taCartellini.updateQty(_UDC, MagClass.magazzino.CodSoggCurrUser, "U", "UDC_QTY", qta); - // aggiorno anche eventuali righe inliste prelievo - MagClass.magazzino.taRigheListePrelievo.stp_RLP_updateQty(_UDC, qta); - // annullo update! + // controllo UDC sia modificabile qta + if (MagClass.magazzino.checkUDC_qty(_UDC)) + { + decimal qta = Convert.ToDecimal(e.InputParameters["Qta"]); + // intercetto l'evento e chiamo una stored ad hoc! + MagClass.magazzino.taCartellini.updateQty(_UDC, MagClass.magazzino.CodSoggCurrUser, "U", "UDC_QTY", qta); + // aggiorno anche eventuali righe inliste prelievo + MagClass.magazzino.taRigheListePrelievo.stp_RLP_updateQty(_UDC, qta); + } + // annullo update! e.Cancel = true; } diff --git a/GMW/GMW_Term/WebUserControls/mod_makeMov.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_makeMov.ascx.cs index 23cee6dd..def8c81d 100644 --- a/GMW/GMW_Term/WebUserControls/mod_makeMov.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_makeMov.ascx.cs @@ -75,10 +75,18 @@ namespace GMW_Term.WebUserControls /// private void spostaUdc(string _UDC, int _idxCella, string _codCella) { - MagClass.magazzino.spostaUDC(memLayer.ML.confReadString("codCS"), _UDC, _idxCella, memLayer.ML.confReadBool("spostaUdcResettaLdp"), Request.UserHostName); - btnConferma.Visible = false; - btnAnnulla.Visible = false; - lblEsito.Text = string.Format("{0} {1} --> {2} ", traduci("ConfermaSpostatoUDC"), _UDC, _codCella); + // controllo UDC sia spostabile (ovvero NON in RLP bloccata) + if (MagClass.magazzino.checkUDC_mov(_UDC)) + { + MagClass.magazzino.spostaUDC(memLayer.ML.confReadString("codCS"), _UDC, _idxCella, memLayer.ML.confReadBool("spostaUdcResettaLdp"), Request.UserHostName); + btnConferma.Visible = false; + btnAnnulla.Visible = false; + lblEsito.Text = string.Format("{0} {1} --> {2} ", traduci("ConfermaSpostatoUDC"), _UDC, _codCella); + } + else + { + lblEsito.Text = string.Format("{0} {1}", traduci("UdcNonSpostabile"), _UDC); + } resetAndUpdate(); } /// @@ -92,13 +100,24 @@ namespace GMW_Term.WebUserControls string _UDC = memLayer.ML.StringSessionObj("UDC_sel"); int _idxCella = memLayer.ML.IntSessionObj("IdxCella_sel"); string _codCella = memLayer.ML.StringSessionObj("codCella_sel"); - // sposto UDC precedente in posizione preimpostata da web.config - string codCellaErroriAnime = memLayer.ML.confReadString("codCellaErroriAnime"); - int idxCellaTo = MagClass.magazzino.taCelle.getByCodCella(codCellaErroriAnime)[0].IdxCella; - string udc2move = MagClass.magazzino.udcInCella(memLayer.ML.confReadString("codCS"), _idxCella); - MagClass.magazzino.spostaUDC(memLayer.ML.confReadString("codCS"), udc2move, idxCellaTo, memLayer.ML.confReadBool("spostaUdcResettaLdp"), Request.UserHostName); - lblEsito.Text = string.Format("{0} {1} --> {2} ", traduci("ConfermaSpostatoUDC"), _UDC, _codCella); - spostaUdc(_UDC, _idxCella, _codCella); + + // controllo UDC sia spostabile (ovvero NON in RLP bloccata) + if (MagClass.magazzino.checkUDC_mov(_UDC)) + { + // sposto UDC precedente in posizione preimpostata da web.config + string codCellaErroriAnime = memLayer.ML.confReadString("codCellaErroriAnime"); + int idxCellaTo = MagClass.magazzino.taCelle.getByCodCella(codCellaErroriAnime)[0].IdxCella; + string udc2move = MagClass.magazzino.udcInCella(memLayer.ML.confReadString("codCS"), _idxCella); + // sposto udc in posizione "errori anime"... + MagClass.magazzino.spostaUDC(memLayer.ML.confReadString("codCS"), udc2move, idxCellaTo, memLayer.ML.confReadBool("spostaUdcResettaLdp"), Request.UserHostName); + lblEsito.Text = string.Format("{0} {1} --> {2} ", traduci("ConfermaSpostatoUDC"), _UDC, _codCella); + // sposto "vero" UDC + spostaUdc(_UDC, _idxCella, _codCella); + } + else + { + lblEsito.Text = string.Format("{0} {1}", traduci("UdcNonSpostabile"), _UDC); + } resetAndUpdate(); } /// diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index b71fe8e7..9c30be57 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 02d2777b..b1d90cf3 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/mazzAppSettings.config b/GMW/GMW_Term/mazzAppSettings.config index ea6c83da..ff94e023 100644 --- a/GMW/GMW_Term/mazzAppSettings.config +++ b/GMW/GMW_Term/mazzAppSettings.config @@ -1,11 +1,11 @@  - + - + @@ -27,7 +27,7 @@ - + @@ -48,44 +48,44 @@ - - + + - + - - - - - - + + + + + + - - - + + + - + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/GMW/GMW_Term/obj/InstallerSP/ResolveAssemblyReference.cache b/GMW/GMW_Term/obj/InstallerSP/ResolveAssemblyReference.cache index c98be752..ea4f38e5 100644 Binary files a/GMW/GMW_Term/obj/InstallerSP/ResolveAssemblyReference.cache and b/GMW/GMW_Term/obj/InstallerSP/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Term/obj/InstallerTK/ResolveAssemblyReference.cache b/GMW/GMW_Term/obj/InstallerTK/ResolveAssemblyReference.cache index f8936c3a..a6ad36aa 100644 Binary files a/GMW/GMW_Term/obj/InstallerTK/ResolveAssemblyReference.cache and b/GMW/GMW_Term/obj/InstallerTK/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj index f873b36a..2fcae828 100644 --- a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj +++ b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj @@ -418,14 +418,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMWT" - "ProductCode" = "8:{C7D8BB73-EDF5-4B7A-95FC-0A9B4641462C}" - "PackageCode" = "8:{044412FD-B6A8-4562-B1C7-42ACC4B3B65E}" + "ProductCode" = "8:{B3473B00-133F-457A-8462-2FFDAE1679AC}" + "PackageCode" = "8:{FB8B801F-81AD-4321-A8AF-197D062076A2}" "UpgradeCode" = "8:{B348C50D-8DAD-4430-AEF0-60800C94CB78}" - "RestartWWWService" = "11:TRUE" + "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:2.0.461" + "ProductVersion" = "8:2.0.463" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" diff --git a/GMW/GMW_Term_installer/InstallerSP/GMW_Term_installer.msi b/GMW/GMW_Term_installer/InstallerSP/GMW_Term_installer.msi index e14ac8a1..ff961503 100644 Binary files a/GMW/GMW_Term_installer/InstallerSP/GMW_Term_installer.msi and b/GMW/GMW_Term_installer/InstallerSP/GMW_Term_installer.msi differ diff --git a/GMW/GMW_Term_installer/InstallerTK/GMW_Term_installer.msi b/GMW/GMW_Term_installer/InstallerTK/GMW_Term_installer.msi index 6045050f..c1be2938 100644 Binary files a/GMW/GMW_Term_installer/InstallerTK/GMW_Term_installer.msi and b/GMW/GMW_Term_installer/InstallerTK/GMW_Term_installer.msi differ diff --git a/GMW/GMW_Term_test_installer/GMW_Term_test_installer.vdproj b/GMW/GMW_Term_test_installer/GMW_Term_test_installer.vdproj index e3fdbe26..93f85d02 100644 --- a/GMW/GMW_Term_test_installer/GMW_Term_test_installer.vdproj +++ b/GMW/GMW_Term_test_installer/GMW_Term_test_installer.vdproj @@ -375,14 +375,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMWT_test" - "ProductCode" = "8:{7EF1D8EA-791B-4B62-BA99-DF0D72D0D889}" - "PackageCode" = "8:{E43D24CE-8BFE-4262-8D2B-CF1B2AA7A4AE}" + "ProductCode" = "8:{9EFDDBB1-2B09-41D3-A8E3-63C4E63E9414}" + "PackageCode" = "8:{0BB832A9-59AD-4329-BCCD-63CCE52E86B8}" "UpgradeCode" = "8:{9A41FB02-98D0-48FB-9924-75BB2A5649A0}" - "RestartWWWService" = "11:TRUE" + "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:2.0.461" + "ProductVersion" = "8:2.0.463" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" diff --git a/GMW/GMW_Term_test_installer/InstallerSP/GMW_Term_test_installer.msi b/GMW/GMW_Term_test_installer/InstallerSP/GMW_Term_test_installer.msi index acbcd9b0..1efbc97e 100644 Binary files a/GMW/GMW_Term_test_installer/InstallerSP/GMW_Term_test_installer.msi and b/GMW/GMW_Term_test_installer/InstallerSP/GMW_Term_test_installer.msi differ diff --git a/GMW/GMW_Term_test_installer/InstallerTK/GMW_Term_test_installer.msi b/GMW/GMW_Term_test_installer/InstallerTK/GMW_Term_test_installer.msi index 63538e68..e9f35b1a 100644 Binary files a/GMW/GMW_Term_test_installer/InstallerTK/GMW_Term_test_installer.msi and b/GMW/GMW_Term_test_installer/InstallerTK/GMW_Term_test_installer.msi differ diff --git a/GMW/GMW_data/DS_magazzino.Designer.cs b/GMW/GMW_data/DS_magazzino.Designer.cs index 007838ec..28ac0ec3 100644 --- a/GMW/GMW_data/DS_magazzino.Designer.cs +++ b/GMW/GMW_data/DS_magazzino.Designer.cs @@ -23163,94 +23163,106 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[14]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[16]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM dbo.RigheListePrelievo"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = "dbo.stp_getRigaPrelievoByCodLista"; + this._commandCollection[1].CommandText = "dbo.stp_RLP_getBloccateMovByUdc"; this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[1].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[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = "dbo.stp_getRigaPrelievoByCodListaPrelevate"; + this._commandCollection[2].CommandText = "dbo.stp_RLP_getBloccateQtaByUdc"; this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[2].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[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = "dbo.stp_RLP_getByUdc"; + this._commandCollection[3].CommandText = "dbo.stp_getRigaPrelievoByCodLista"; this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[3].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[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; - this._commandCollection[4].CommandText = "dbo.stp_RLP_getOpenByUserTipo"; + this._commandCollection[4].CommandText = "dbo.stp_getRigaPrelievoByCodListaPrelevate"; this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[4].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[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.NVarChar, 17, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodTipoLista", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, 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_righePrelevateByUdc"; + this._commandCollection[5].CommandText = "dbo.stp_RLP_getByUdc"; 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, 50, global::System.Data.ParameterDirection.Input, 0, 0, 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_setAnnullaUdcPrelevato"; + this._commandCollection[6].CommandText = "dbo.stp_RLP_getOpenByUserTipo"; 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("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, 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.NVarChar, 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("@CodSoggetto", global::System.Data.SqlDbType.NVarChar, 17, 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("@CodTipoLista", global::System.Data.SqlDbType.NVarChar, 10, 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_RigheListePrelievo_eliminaNonPrelevate"; + this._commandCollection[7].CommandText = "dbo.stp_righePrelevateByUdc"; 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("@CodLista", global::System.Data.SqlDbType.VarChar, 12, 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", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[8] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[8].Connection = this.Connection; - this._commandCollection[8].CommandText = "dbo.stp_RLP_deleteFromCodLista"; + this._commandCollection[8].CommandText = "dbo.stp_setAnnullaUdcPrelevato"; this._commandCollection[8].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[8].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[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodLista", global::System.Data.SqlDbType.VarChar, 12, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[9] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[9].Connection = this.Connection; - this._commandCollection[9].CommandText = "dbo.stp_RLP_eliminaNonPrelevate"; + this._commandCollection[9].CommandText = "dbo.stp_RigheListePrelievo_eliminaNonPrelevate"; this._commandCollection[9].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[9].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[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.VarChar, 12, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[10] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[10].Connection = this.Connection; - this._commandCollection[10].CommandText = "dbo.stp_RLP_resetPrelevate"; + this._commandCollection[10].CommandText = "dbo.stp_RLP_deleteFromCodLista"; this._commandCollection[10].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[10].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[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodLista", global::System.Data.SqlDbType.VarChar, 12, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[11] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[11].Connection = this.Connection; - this._commandCollection[11].CommandText = "dbo.stp_RLP_sbloccaNonPrelevate"; + this._commandCollection[11].CommandText = "dbo.stp_RLP_eliminaNonPrelevate"; this._commandCollection[11].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[11].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[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[12] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[12].Connection = this.Connection; - this._commandCollection[12].CommandText = "dbo.stp_RLP_updateQty"; + this._commandCollection[12].CommandText = "dbo.stp_RLP_resetPrelevate"; this._commandCollection[12].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[12].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[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Qta", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[13] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[13].Connection = this.Connection; - this._commandCollection[13].CommandText = "dbo.stp_UDC_upsertPrelevato"; + this._commandCollection[13].CommandText = "dbo.stp_RLP_sbloccaNonPrelevate"; this._commandCollection[13].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[13].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[13].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[13].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[14] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[14].Connection = this.Connection; + this._commandCollection[14].CommandText = "dbo.stp_RLP_updateQty"; + this._commandCollection[14].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[14].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[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Qta", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[15] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[15].Connection = this.Connection; + this._commandCollection[15].CommandText = "dbo.stp_UDC_upsertPrelevato"; + this._commandCollection[15].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[15].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[15].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[15].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -23278,8 +23290,40 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_magazzino.RigheListePrelievoDataTable getByCodLista(string CodLista) { + public virtual DS_magazzino.RigheListePrelievoDataTable getBloccateMovByUdc(string UDC) { this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((UDC == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(UDC)); + } + DS_magazzino.RigheListePrelievoDataTable dataTable = new DS_magazzino.RigheListePrelievoDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_magazzino.RigheListePrelievoDataTable getBloccateQtaByUdc(string UDC) { + this.Adapter.SelectCommand = this.CommandCollection[2]; + if ((UDC == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(UDC)); + } + DS_magazzino.RigheListePrelievoDataTable dataTable = new DS_magazzino.RigheListePrelievoDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_magazzino.RigheListePrelievoDataTable getByCodLista(string CodLista) { + this.Adapter.SelectCommand = this.CommandCollection[3]; if ((CodLista == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -23295,7 +23339,7 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_magazzino.RigheListePrelievoDataTable getByCodListaPrelevate(string CodLista) { - this.Adapter.SelectCommand = this.CommandCollection[2]; + this.Adapter.SelectCommand = this.CommandCollection[4]; if ((CodLista == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -23311,7 +23355,7 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_magazzino.RigheListePrelievoDataTable getByUdc(string UDC) { - this.Adapter.SelectCommand = this.CommandCollection[3]; + this.Adapter.SelectCommand = this.CommandCollection[5]; if ((UDC == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -23327,7 +23371,7 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_magazzino.RigheListePrelievoDataTable getOpenByUserTipo(string CodSoggetto, string CodTipoLista) { - this.Adapter.SelectCommand = this.CommandCollection[4]; + this.Adapter.SelectCommand = this.CommandCollection[6]; if ((CodSoggetto == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -23349,7 +23393,7 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_magazzino.RigheListePrelievoDataTable getPrelevateByUdc(string UDC) { - this.Adapter.SelectCommand = this.CommandCollection[5]; + this.Adapter.SelectCommand = this.CommandCollection[7]; if ((UDC == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -23365,7 +23409,7 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_magazzino.RigheListePrelievoDataTable setAnnullaUdcPrelevato(string CodLista, string UDC) { - this.Adapter.SelectCommand = this.CommandCollection[6]; + this.Adapter.SelectCommand = this.CommandCollection[8]; if ((CodLista == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -23387,7 +23431,7 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_magazzino.RigheListePrelievoDataTable upsertPrelevato(string CodLista, string UDC) { - this.Adapter.SelectCommand = this.CommandCollection[13]; + this.Adapter.SelectCommand = this.CommandCollection[15]; if ((CodLista == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -23608,60 +23652,6 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int stp_RigheListePrelievo_eliminaNonPrelevate(string CodLista) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; - if ((CodLista == null)) { - command.Parameters[1].Value = global::System.DBNull.Value; - } - else { - command.Parameters[1].Value = ((string)(CodLista)); - } - 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_RLP_deleteFromCodLista(string Original_CodLista) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[8]; - if ((Original_CodLista == null)) { - command.Parameters[1].Value = global::System.DBNull.Value; - } - else { - command.Parameters[1].Value = ((string)(Original_CodLista)); - } - 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_RLP_eliminaNonPrelevate(string CodLista) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[9]; if ((CodLista == null)) { command.Parameters[1].Value = global::System.DBNull.Value; @@ -23688,8 +23678,62 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int stp_RLP_resetPrelevate(string CodLista) { + public virtual int stp_RLP_deleteFromCodLista(string Original_CodLista) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[10]; + if ((Original_CodLista == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(Original_CodLista)); + } + 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_RLP_eliminaNonPrelevate(string CodLista) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[11]; + if ((CodLista == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(CodLista)); + } + 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_RLP_resetPrelevate(string CodLista) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[12]; if ((CodLista == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -23716,7 +23760,7 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int stp_RLP_sbloccaNonPrelevate(string CodLista, string UDC) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[11]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[13]; if ((CodLista == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -23749,7 +23793,7 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int stp_RLP_updateQty(string UDC, global::System.Nullable Qta) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[12]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[14]; if ((UDC == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } diff --git a/GMW/GMW_data/DS_magazzino.xsd b/GMW/GMW_data/DS_magazzino.xsd index 720ac51b..1a48221a 100644 --- a/GMW/GMW_data/DS_magazzino.xsd +++ b/GMW/GMW_data/DS_magazzino.xsd @@ -1827,6 +1827,28 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co + + + + dbo.stp_RLP_getBloccateMovByUdc + + + + + + + + + + + dbo.stp_RLP_getBloccateQtaByUdc + + + + + + + @@ -2817,122 +2839,122 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - - - - + + + + - - - - - - + + + + + + @@ -2945,153 +2967,6 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3106,18 +2981,18 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - - - - - - - - + + + + + + + + - + @@ -3127,7 +3002,154 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3141,79 +3163,79 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - + - + - + - + - - - + + + - - + + - - + + - + - + - - - - - - + + + + + + @@ -3226,21 +3248,21 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - + - + - + @@ -3251,6 +3273,350 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3267,365 +3633,21 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -3638,131 +3660,131 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - - + + - + - - + + - - - + + + - + - - + + - - + + - + - - - + + + - - - + + + - + - + - + - - + + - - + + - + - + @@ -3782,8 +3804,8 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - - + + @@ -3796,33 +3818,33 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - - - + + + - + - - + + - - - + + + @@ -3835,42 +3857,42 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - + - + - + - + - + - + @@ -3883,21 +3905,21 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - + - + - + diff --git a/GMW/GMW_data/DS_magazzino.xss b/GMW/GMW_data/DS_magazzino.xss index 3d39cc0f..b1caa62d 100644 --- a/GMW/GMW_data/DS_magazzino.xss +++ b/GMW/GMW_data/DS_magazzino.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -19,7 +19,7 @@ - + @@ -124,7 +124,7 @@ 926 - 319 + 352 926 diff --git a/GMW/GMW_data/GMW_data.csproj b/GMW/GMW_data/GMW_data.csproj index d3b6550d..3a12669d 100644 --- a/GMW/GMW_data/GMW_data.csproj +++ b/GMW/GMW_data/GMW_data.csproj @@ -342,8 +342,11 @@ + + +