diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config index e89b4fda..9c2f4a14 100644 --- a/GMW/GMW/Web.config +++ b/GMW/GMW/Web.config @@ -93,6 +93,7 @@ + diff --git a/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx b/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx index ad5869c0..789f5a7c 100644 --- a/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx +++ b/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx @@ -24,6 +24,7 @@ + mostrare solo mag >0 diff --git a/GMW/GMW/WebUserControls/mod_labAssStampaUdc.ascx b/GMW/GMW/WebUserControls/mod_labAssStampaUdc.ascx index cd9cc09f..ccb1a947 100644 --- a/GMW/GMW/WebUserControls/mod_labAssStampaUdc.ascx +++ b/GMW/GMW/WebUserControls/mod_labAssStampaUdc.ascx @@ -3,15 +3,13 @@ <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> <%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %> <%@ Register Src="mod_periodoAnalisi.ascx" TagName="mod_periodoAnalisi" TagPrefix="uc2" %> -<%@ Register Src="mod_detailUDC.ascx" TagName="mod_detailUDC" TagPrefix="uc3" %>
- - - +
@@ -20,7 +18,7 @@ @@ -31,17 +29,6 @@ - - - - - - - - - -    - - - diff --git a/GMW/GMW/WebUserControls/mod_labAssStampaUdc.ascx.cs b/GMW/GMW/WebUserControls/mod_labAssStampaUdc.ascx.cs index 32c17f25..0660a210 100644 --- a/GMW/GMW/WebUserControls/mod_labAssStampaUdc.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_labAssStampaUdc.ascx.cs @@ -13,10 +13,6 @@ namespace GMW.WebUserControls #region area protected - protected string _idxGridView; - protected string _idxGridViewExt; - protected string _tabCache; - /// /// aggiorna controlli datagrid e numero righe in pagina /// @@ -104,7 +100,6 @@ namespace GMW.WebUserControls protected override void traduciObj() { base.traduciObj(); - lblNumDayBack.Text = traduci("lblNumDayBack"); btnReloadDataRQL.Text = traduci("btnReloadDataRQL"); } @@ -132,12 +127,9 @@ namespace GMW.WebUserControls protected override void OnInit(EventArgs e) { base.OnInit(e); - _idxGridView = "UDC"; if (!Page.IsPostBack) { - btnDelibera.Text = traduci("btnDelibera"); - cbeBtnDelibera.ConfirmText = traduci("cbeBtnDelibera"); - mod_detailUDC1.Visible = false; + btnDelibera.Visible = false; checkFixOds(); } } @@ -222,16 +214,36 @@ namespace GMW.WebUserControls protected void grView_SelectedIndexChanged(object sender, EventArgs e) { // salvo in session il valore selezionato... - SteamWare.memLayer.ML.setSessionVal(string.Format("{0}_sel", _idxGridView), grView.SelectedValue, true); - - mod_detailUDC1.Visible = true; - mod_detailUDC1.doUpdate(); - - //// sollevo evento nuovo valore... - //if (eh_selValore != null) - //{ - // eh_selValore(this, new EventArgs()); - //} + string numRappQualUdc = grView.SelectedDataKey["nRapQual"].ToString(); + int UdcAssoc = Convert.ToInt32(grView.SelectedDataKey["UdcAssoc"]); + string benestare = grView.SelectedDataKey["BenesQual"].ToString(); + // controllo il benestare... + if (benestare.ToUpper() == "S") // benestare S = è possibile prendere in carico... + { + btnDelibera.Visible = true; + // sistemo traduzione... + bool udc2Create = false; + try + { + udc2Create = (UdcAssoc == 0); + } + catch + { } + if (udc2Create) + { + btnDelibera.Text = traduci("btnStampaUdc"); + cbeBtnDelibera.ConfirmText = traduci("cbeBtnStampaUdc"); + } + else + { + btnDelibera.Text = traduci("btnRiStampaUdc"); + cbeBtnDelibera.ConfirmText = traduci("cbeBtnRiStampaUdc"); + } + } + else + { + btnDelibera.Visible = false; + } } /// /// seleziona/deseleziona le righe indicate... @@ -261,8 +273,7 @@ namespace GMW.WebUserControls /// public void resetSelezione() { - mod_detailUDC1.Visible = false; - SteamWare.memLayer.ML.emptySessionVal(string.Format("{0}_sel", _idxGridView)); + btnDelibera.Visible = false; grView.SelectedIndex = -1; grView.DataBind(); lblWarning.Visible = false; @@ -278,27 +289,44 @@ namespace GMW.WebUserControls /// protected void btnDelibera_Click(object sender, EventArgs e) { - DateTime start; - foreach (GridViewRow riga in grView.Rows) + bool fatto = false; + // salvo in session il valore selezionato... + int numRappQualUdc = Convert.ToInt32(grView.SelectedDataKey["nRapQual"]); + int UdcAssoc = Convert.ToInt32(grView.SelectedDataKey["UdcAssoc"]); + // sistemo traduzione... + bool udc2Create = false; + try { - if (((CheckBox)riga.FindControl("chkSelect")).Checked) - { - start = DateTime.Now; - // recupero codice UDC... - string UDC = ((Label)riga.FindControl("lblUDC")).Text; - //// chiamo stored x fare delibera con state machine - //StateMachine.SM.deliberaUdc(UDC, mod_filtroDelibera.valore); - } + udc2Create = (UdcAssoc == 0); + } + catch + { } + if (udc2Create) + { + fatto = MagClass.magazzino.creaUdcDaRappQualita(numRappQualUdc, true); + } + else + { + fatto = MagClass.magazzino.stampaUdcDaRappQualita(numRappQualUdc); } grView.DataBind(); - - - //bool fatto= MagClass.magazzino.creaUdcDaRappQualita(numRappUdc, true); - //if (!fatto) - //{ - // MagClass.magazzino.stampaUdcDaRappQualita(numRappUdc); - //} } + /// + /// forza il ricaricamento da AS400 i dati per il numero di giorni richiesto + /// + /// + /// + protected void btnReloadDataRQL_Click(object sender, EventArgs e) + { + int numGgPassati = memLayer.ML.confReadInt("numGgToReloadRQ"); + // stored 1 : ricarico da AS400 + utils.obj.taSTP.stp_batch_RapQual_S01(DateTime.Now.AddDays(-numGgPassati)); + // stored 2 aggiorno tabella + utils.obj.taSTP.stp_batch_RapQual_S02(); + // update + resetSelezione(); + } + #endregion diff --git a/GMW/GMW/WebUserControls/mod_labAssStampaUdc.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_labAssStampaUdc.ascx.designer.cs index da3715f3..abe5adb7 100644 --- a/GMW/GMW/WebUserControls/mod_labAssStampaUdc.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_labAssStampaUdc.ascx.designer.cs @@ -22,24 +22,6 @@ namespace GMW.WebUserControls { /// protected global::mod_periodoAnalisi mod_periodoAnalisi1; - /// - /// lblNumDayBack control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblNumDayBack; - - /// - /// txtNumDayBack control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox txtNumDayBack; - /// /// btnReloadDataRQL control. /// @@ -85,15 +67,6 @@ namespace GMW.WebUserControls { /// protected global::System.Web.UI.WebControls.Label lblWarning; - /// - /// mod_detailUDC1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::GMW.WebUserControls.mod_detailUDC mod_detailUDC1; - /// /// btnDelibera control. /// diff --git a/GMW/GMW/WebUserControls/mod_labConsUdc.ascx b/GMW/GMW/WebUserControls/mod_labConsUdc.ascx index 21786bf3..502c5419 100644 --- a/GMW/GMW/WebUserControls/mod_labConsUdc.ascx +++ b/GMW/GMW/WebUserControls/mod_labConsUdc.ascx @@ -1,2 +1,16 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_labConsUdc.ascx.cs" Inherits="GMW.WebUserControls.mod_labConsUdc" %> -W.I.P. \ No newline at end of file +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_labConsUdc.ascx.cs" + Inherits="GMW.WebUserControls.mod_labConsUdc" %> +
+ deve essere panel che si apre/chiude, opppure sempre visibile? +
+
+ +
+ +
+
+ elenco degli udc consumabili... update realtime da barcode e/o altro, con gestioen + checkbox x consumo in blocchi +
+
+ scelta del tipo di consumo: interno/ext, codice terzista...
diff --git a/GMW/GMW/WebUserControls/mod_labConsUdc.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_labConsUdc.ascx.designer.cs index d4f9289c..c9758e73 100644 --- a/GMW/GMW/WebUserControls/mod_labConsUdc.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_labConsUdc.ascx.designer.cs @@ -12,5 +12,23 @@ namespace GMW.WebUserControls { public partial class mod_labConsUdc { + + /// + /// lblBarcodeConsumoUdcMP control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblBarcodeConsumoUdcMP; + + /// + /// txtBarcode control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtBarcode; } } diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 810ffda9..4e359809 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 2deadab7..2c863de8 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 c7b159f2..96e0b0c7 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 f42639a5..6a092dcd 100644 --- a/GMW/GMW/mazzAppSettings.config +++ b/GMW/GMW/mazzAppSettings.config @@ -38,6 +38,7 @@ + diff --git a/GMW/GMW/obj/Debug/GMW.csproj.FileListAbsolute.txt b/GMW/GMW/obj/Debug/GMW.csproj.FileListAbsolute.txt index 0435c396..4c114e1d 100644 --- a/GMW/GMW/obj/Debug/GMW.csproj.FileListAbsolute.txt +++ b/GMW/GMW/obj/Debug/GMW.csproj.FileListAbsolute.txt @@ -1,3 +1,6 @@ +c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\ResolveAssemblyReference.cache +c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\RdlCompile.cache +c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\RdlCompile.compiled c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\GMW.dll c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\GMW.pdb c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\AjaxControlToolkit.dll @@ -26,8 +29,5 @@ c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\ c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\tr-TR\AjaxControlToolkit.resources.dll c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\zh-CHS\AjaxControlToolkit.resources.dll c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\zh-CHT\AjaxControlToolkit.resources.dll -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\ResolveAssemblyReference.cache -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\RdlCompile.cache -c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\RdlCompile.compiled c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\GMW.dll c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\GMW.pdb diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 810ffda9..4e359809 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 de630da2..09f608b7 100644 Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Term/GMW_Term.csproj b/GMW/GMW_Term/GMW_Term.csproj index c12dce7d..edfb4f47 100644 --- a/GMW/GMW_Term/GMW_Term.csproj +++ b/GMW/GMW_Term/GMW_Term.csproj @@ -330,7 +330,7 @@ False True - 50077 + 63567 / diff --git a/GMW/GMW_Term/Web.config b/GMW/GMW_Term/Web.config index 07a80b4a..a8cb9395 100644 --- a/GMW/GMW_Term/Web.config +++ b/GMW/GMW_Term/Web.config @@ -57,7 +57,7 @@ - + diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index 56e6cdc5..46f3de6b 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 591d0e13..fccc42f3 100644 Binary files a/GMW/GMW_Term/bin/GMW_data.dll and b/GMW/GMW_Term/bin/GMW_data.dll differ diff --git a/GMW/GMW_Term/bin/SteamWare.dll b/GMW/GMW_Term/bin/SteamWare.dll index 32aaeb13..96e0b0c7 100644 Binary files a/GMW/GMW_Term/bin/SteamWare.dll and b/GMW/GMW_Term/bin/SteamWare.dll differ diff --git a/GMW/GMW_Term/mazzAppSettings.config b/GMW/GMW_Term/mazzAppSettings.config index 59b5c15a..c53b5377 100644 --- a/GMW/GMW_Term/mazzAppSettings.config +++ b/GMW/GMW_Term/mazzAppSettings.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index 6131166c..46f3de6b 100644 Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ diff --git a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache index 94a83452..eb883f2f 100644 Binary files a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj index ce4443bb..b0f98a3b 100644 --- a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj +++ b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj @@ -345,7 +345,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW_Term" "ProductCode" = "8:{0E2CFBF4-7822-4419-AB79-3D0A1148B859}" - "PackageCode" = "8:{2DEA41FE-2AB0-4F37-B9BB-6BB738B9A885}" + "PackageCode" = "8:{94D57F74-FC98-49EF-BB93-1888C0CEFB4E}" "UpgradeCode" = "8:{B348C50D-8DAD-4430-AEF0-60800C94CB78}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" @@ -824,7 +824,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_9C1BA08A590A44EC9515C0F91AD50A1D" { - "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe" + "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A89965CB827F476CB8D496FFFC9653DF" @@ -852,7 +852,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B0271B832DBE45F0B50639E61DAE3CF4" { - "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe" + "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A89965CB827F476CB8D496FFFC9653DF" diff --git a/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi b/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi index accd4ab5..4c734a8d 100644 Binary files a/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi and b/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi differ diff --git a/GMW/GMW_data/DS_Utility.Designer.cs b/GMW/GMW_data/DS_Utility.Designer.cs index e8ad912a..e3646295 100644 --- a/GMW/GMW_data/DS_Utility.Designer.cs +++ b/GMW/GMW_data/DS_Utility.Designer.cs @@ -6165,7 +6165,7 @@ namespace GMW_data.DS_UtilityTableAdapters { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[9]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[11]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "dbo.stp_dummy"; @@ -6173,42 +6173,35 @@ namespace GMW_data.DS_UtilityTableAdapters { this._commandCollection[0].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] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = "dbo.stp_celleCreaMancantiBlocco"; + this._commandCollection[1].CommandText = "BatchQueue.stp_batch_RapQual_S01"; 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("@CodCS", global::System.Data.SqlDbType.VarChar, 2, 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("@CodMag", global::System.Data.SqlDbType.VarChar, 50, 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("@IdxBlocco", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxTipoCellaNew", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@minData", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, 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_ContaCelle4Blocchi"; + this._commandCollection[2].CommandText = "BatchQueue.stp_batch_RapQual_S02"; 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("@CodCS", global::System.Data.SqlDbType.VarChar, 2, 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("@CodMag", global::System.Data.SqlDbType.VarChar, 50, 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("@TotCelle", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.InputOutput, 10, 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_ContaCelle4Tipo"; + this._commandCollection[3].CommandText = "dbo.stp_celleCreaMancantiBlocco"; 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("@CodCS", global::System.Data.SqlDbType.VarChar, 2, 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("@CodMag", 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("@TotCelle", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.InputOutput, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxBlocco", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxTipoCellaNew", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 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_ContaCelleBlocco"; + this._commandCollection[4].CommandText = "dbo.stp_ContaCelle4Blocchi"; 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("@CodCS", global::System.Data.SqlDbType.VarChar, 2, 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("@CodMag", global::System.Data.SqlDbType.VarChar, 50, 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("@FiltAttive", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PosAssegnata", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotCelle", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.InputOutput, 10, 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_ContaCelleCapa"; + this._commandCollection[5].CommandText = "dbo.stp_ContaCelle4Tipo"; 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("@CodCS", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -6216,28 +6209,46 @@ namespace GMW_data.DS_UtilityTableAdapters { this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotCelle", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.InputOutput, 10, 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_ContaCelleCreate"; + this._commandCollection[6].CommandText = "dbo.stp_ContaCelleBlocco"; 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("@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("@CodMag", 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("@FiltAttive", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PosAssegnata", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotCelle", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.InputOutput, 10, 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_ContaDeltaCelleBlocco"; + this._commandCollection[7].CommandText = "dbo.stp_ContaCelleCapa"; 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("@IdxBlocco", 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("@DeltaCelle", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.InputOutput, 10, 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("@CodMag", 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("@TotCelle", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.InputOutput, 10, 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_UDC_delibera"; + this._commandCollection[8].CommandText = "dbo.stp_ContaCelleCreate"; 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("@CodTipoDelibera", global::System.Data.SqlDbType.NVarChar, 50, 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[8].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[8].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[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodMag", global::System.Data.SqlDbType.VarChar, 50, 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("@TotCelle", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.InputOutput, 10, 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_ContaDeltaCelleBlocco"; + 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("@IdxBlocco", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DeltaCelle", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.InputOutput, 10, 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_UDC_delibera"; + 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("@CodTipoDelibera", global::System.Data.SqlDbType.NVarChar, 50, 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("@UDC", global::System.Data.SqlDbType.NVarChar, 50, 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("@CodSoggetto", global::System.Data.SqlDbType.NVarChar, 17, 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("@CodCS", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -6264,8 +6275,56 @@ namespace GMW_data.DS_UtilityTableAdapters { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int stp_celleCreaMancantiBlocco(string CodCS, string CodMag, global::System.Nullable IdxBlocco, global::System.Nullable IdxTipoCellaNew) { + public virtual int stp_batch_RapQual_S01(global::System.Nullable minData) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; + if ((minData.HasValue == true)) { + command.Parameters[1].Value = ((System.DateTime)(minData.Value)); + } + else { + command.Parameters[1].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_batch_RapQual_S02() { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; + 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_celleCreaMancantiBlocco(string CodCS, string CodMag, global::System.Nullable IdxBlocco, global::System.Nullable IdxTipoCellaNew) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; if ((CodCS == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -6310,7 +6369,7 @@ namespace GMW_data.DS_UtilityTableAdapters { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int stp_ContaCelle4Blocchi(string CodCS, string CodMag, ref global::System.Nullable TotCelle) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; if ((CodCS == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -6356,7 +6415,7 @@ namespace GMW_data.DS_UtilityTableAdapters { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int stp_ContaCelle4Tipo(string CodCS, string CodMag, ref global::System.Nullable TotCelle) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; if ((CodCS == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -6402,7 +6461,7 @@ namespace GMW_data.DS_UtilityTableAdapters { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int stp_ContaCelleBlocco(string CodCS, string CodMag, global::System.Nullable FiltAttive, global::System.Nullable PosAssegnata, ref global::System.Nullable TotCelle) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; if ((CodCS == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -6460,7 +6519,7 @@ namespace GMW_data.DS_UtilityTableAdapters { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual object stp_ContaCelleCapa(string CodCS, string CodMag, ref global::System.Nullable TotCelle) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; if ((CodCS == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -6512,7 +6571,7 @@ namespace GMW_data.DS_UtilityTableAdapters { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int stp_ContaCelleCreate(string CodCS, string CodMag, ref global::System.Nullable TotCelle) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[8]; if ((CodCS == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -6558,7 +6617,7 @@ namespace GMW_data.DS_UtilityTableAdapters { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int stp_ContaDeltaCelleBlocco(global::System.Nullable IdxBlocco, ref global::System.Nullable DeltaCelle) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[9]; if ((IdxBlocco.HasValue == true)) { command.Parameters[1].Value = ((int)(IdxBlocco.Value)); } @@ -6598,7 +6657,7 @@ namespace GMW_data.DS_UtilityTableAdapters { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int stp_UDC_delibera(string CodTipoDelibera, string UDC, string CodSoggetto, string CodCS) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[8]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[10]; if ((CodTipoDelibera == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } diff --git a/GMW/GMW_data/DS_Utility.xsd b/GMW/GMW_data/DS_Utility.xsd index f7eb978e..a45e2f26 100644 --- a/GMW/GMW_data/DS_Utility.xsd +++ b/GMW/GMW_data/DS_Utility.xsd @@ -158,6 +158,27 @@ WHERE (value = @value) + + + + BatchQueue.stp_batch_RapQual_S01 + + + + + + + + + + + BatchQueue.stp_batch_RapQual_S02 + + + + + + @@ -468,21 +489,21 @@ WHERE (conditio = @conditio) - + - + - + @@ -495,22 +516,22 @@ WHERE (conditio = @conditio) - - + + - + - + @@ -523,35 +544,15 @@ WHERE (conditio = @conditio) - - + + - - - - - - - - - - - - - - - - - - - - - + @@ -565,21 +566,41 @@ WHERE (conditio = @conditio) - + + + + + + + - + + + + + + + + + + + + + + + - + @@ -592,29 +613,29 @@ WHERE (conditio = @conditio) - - + + - + - + - + @@ -627,8 +648,8 @@ WHERE (conditio = @conditio) - - + + @@ -641,14 +662,14 @@ WHERE (conditio = @conditio) - + - + @@ -661,21 +682,21 @@ WHERE (conditio = @conditio) - + - + - + @@ -688,14 +709,14 @@ WHERE (conditio = @conditio) - + - + @@ -708,7 +729,7 @@ WHERE (conditio = @conditio) - + @@ -721,21 +742,21 @@ WHERE (conditio = @conditio) - + - + - + @@ -748,21 +769,21 @@ WHERE (conditio = @conditio) - + - + - + diff --git a/GMW/GMW_data/DS_Utility.xss b/GMW/GMW_data/DS_Utility.xss index 60da6944..46e41617 100644 --- a/GMW/GMW_data/DS_Utility.xss +++ b/GMW/GMW_data/DS_Utility.xss @@ -4,13 +4,13 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + diff --git a/GMW/GMW_data/DS_magazzino.Designer.cs b/GMW/GMW_data/DS_magazzino.Designer.cs index b0eb2fe4..1109a318 100644 --- a/GMW/GMW_data/DS_magazzino.Designer.cs +++ b/GMW/GMW_data/DS_magazzino.Designer.cs @@ -24835,7 +24835,7 @@ SELECT nRapQual, DataRapQual, ProgUDC, CodFor, DestTerz, CodLega, DataPrelFus, T [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT nRapQual, DataRapQual, CodFor, CodLega, Qta, BenesQual, UdcTot, UdcAssoc F" + @@ -24848,6 +24848,12 @@ SELECT nRapQual, DataRapQual, ProgUDC, CodFor, DestTerz, CodLega, DataPrelFus, T 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("@dataFrom", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dataTo", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, 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_rappQualSuntoGetByNumRap"; + 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("@nRapQual", global::System.Data.SqlDbType.NVarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -24893,6 +24899,22 @@ SELECT nRapQual, DataRapQual, ProgUDC, CodFor, DestTerz, CodLega, DataPrelFus, T 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.v_RapQualSuntoDataTable getByNumRap(string nRapQual) { + this.Adapter.SelectCommand = this.CommandCollection[2]; + if ((nRapQual == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(nRapQual)); + } + DS_magazzino.v_RapQualSuntoDataTable dataTable = new DS_magazzino.v_RapQualSuntoDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } } /// diff --git a/GMW/GMW_data/DS_magazzino.xsd b/GMW/GMW_data/DS_magazzino.xsd index 71ee7754..4af35434 100644 --- a/GMW/GMW_data/DS_magazzino.xsd +++ b/GMW/GMW_data/DS_magazzino.xsd @@ -2372,6 +2372,17 @@ WHERE (IdxPosizione = @IdxPosizione) + + + + dbo.stp_rappQualSuntoGetByNumRap + + + + + + + diff --git a/GMW/GMW_data/DS_magazzino.xss b/GMW/GMW_data/DS_magazzino.xss index f0aa4763..fcdf6b41 100644 --- a/GMW/GMW_data/DS_magazzino.xss +++ b/GMW/GMW_data/DS_magazzino.xss @@ -28,7 +28,7 @@ - + diff --git a/GMW/GMW_data/MagClass.cs b/GMW/GMW_data/MagClass.cs index 5c9b2548..55d95457 100644 --- a/GMW/GMW_data/MagClass.cs +++ b/GMW/GMW_data/MagClass.cs @@ -32,6 +32,7 @@ namespace GMW_data public DS_magazzinoTableAdapters.v_particolariEsponenteFiguraTableAdapter taPartExpFig; public DS_magazzinoTableAdapters.V_statoCelleCapienzaAssegnatiTableAdapter taStatoCelle; public DS_magazzinoTableAdapters.RapQualTableAdapter taRapQual; + public DS_magazzinoTableAdapters.v_RapQualSuntoTableAdapter taRQ_sunto; public DS_magazzinoTableAdapters.v_posizioniDelibereTableAdapter taPosizDelib; @@ -60,6 +61,7 @@ namespace GMW_data taPartExpFig = new GMW_data.DS_magazzinoTableAdapters.v_particolariEsponenteFiguraTableAdapter(); taStatoCelle = new GMW_data.DS_magazzinoTableAdapters.V_statoCelleCapienzaAssegnatiTableAdapter(); taRapQual = new GMW_data.DS_magazzinoTableAdapters.RapQualTableAdapter(); + taRQ_sunto = new GMW_data.DS_magazzinoTableAdapters.v_RapQualSuntoTableAdapter(); taPosizDelib = new GMW_data.DS_magazzinoTableAdapters.v_posizioniDelibereTableAdapter(); } /// @@ -87,6 +89,7 @@ namespace GMW_data taPartExpFig.Connection.ConnectionString = memLayer.ML.confReadString("GMWConnectionString"); taStatoCelle.Connection.ConnectionString = memLayer.ML.confReadString("GMWConnectionString"); taRapQual.Connection.ConnectionString = memLayer.ML.confReadString("GMWConnectionString"); + taRQ_sunto.Connection.ConnectionString = memLayer.ML.confReadString("GMWConnectionString"); taPosizDelib.Connection.ConnectionString = memLayer.ML.confReadString("GMWConnectionString"); } @@ -1084,15 +1087,13 @@ namespace GMW_data string UDC = ""; foreach (DS_magazzino.RapQualRow rqRow in tabRapQual) { - // se non ha già un UDC... - if (rqRow.UDC != "") + // se non ha già un UDC... e se NON E' stato già scaricato... + if (rqRow.UDC == "" && rqRow.LegaScaric.ToUpper() == "N") { answ = true; // per ogni riga creo un UDC DS_Applicazione.ElencoCartelliniDataTable tabCartellini = DataProxy.obj.taCartellini.stp_insNewFull(memLayer.ML.confReadString("CodCS"), memLayer.ML.confReadString("BilanciaMP"), string.Format("{0:yy}", DateTime.Now), rqRow.CodFor, rqRow.CodLega, "", "", "", "", DateTime.Now, 0, memLayer.ML.confReadString("CodImballoMP"), CodSoggCurrUser, 0, memLayer.ML.confReadInt("IdxPosizMP"), "M", "UDC_MP", rqRow.Qta, Convert.ToDouble(rqRow.Qta), 1, memLayer.ML.confReadString("CodStatoMP"), "", false); // UDC_MP HARD CODED!!! - //DS_Applicazione.ElencoCartelliniDataTable tabCartellini = DataProxy.obj.taCartellini.stp_insNew(memLayer.ML.confReadString("CodCS"), memLayer.ML.confReadString("BilanciaMP"), string.Format("{0:yy}", DateTime.Now), 0, memLayer.ML.confReadString("CodImballoMP"), "M", CodOperatore, "UDC_MP"); // UDC_MP HARD CODED!!! - try { UDC = tabCartellini[0].UDC; @@ -1135,7 +1136,7 @@ namespace GMW_data } return answ; } - + #endregion diff --git a/GMW/GMW_data/SqlScripts/GMW_00260.sql b/GMW/GMW_data/SqlScripts/GMW_00260.sql index 14d87df2..622334c3 100644 --- a/GMW/GMW_data/SqlScripts/GMW_00260.sql +++ b/GMW/GMW_data/SqlScripts/GMW_00260.sql @@ -976,7 +976,124 @@ go - +/****** Object: StoredProcedure [dbo].[stp_UDC_insNew] Script Date: 09/29/2010 14:53:58 ******/ +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + + +/*************************************** +* STORED stp_UDC_insNew +* +* crea un nuovo record nella TabStatoOdpUdc e restituisce il codice UDC appena creato +* +* Steamware, S.E.L. +* mod: 2010.04.28 +* +****************************************/ +ALTER PROCEDURE [dbo].[stp_UDC_insNew] +( + @CodCS VARCHAR(2), + @Flusso VARCHAR(2), + @Anno VARCHAR(2), + @Tara FLOAT, + @CodImballo AS VARCHAR(50), + @CodTipoDichiaraz CHAR(1), + @CodSoggetto VARCHAR(17) +) +AS + +-- DECLARE iniziali +DECLARE @UDC AS VARCHAR(20) +DECLARE @numFlu AS INT +DECLARE @numUdc AS INT +DECLARE @nextUdc AS INT + +------------------------------------------------------------------------------------------------------ +-- Flusso +------------------------------------------------------------------------------------------------------ +-- controllo se esiste il flusso (bilancia)... +SET @numFlu = ( + SELECT count(*) + FROM AnagBilance + WHERE CodBilancia = @Flusso +) +-- ...sennò lo creo... +IF(@numFlu = 0) + BEGIN + -- se c'è inserisco in tab + INSERT INTO AnagBilance(CodBilancia, DescrImpianto, CodCS) + VALUES (@Flusso, @Flusso, @CodCS) + END +------------------------------------------------------------------------------------------------------ + + +------------------------------------------------------------------------------------------------------ +-- UDC +------------------------------------------------------------------------------------------------------ +-- controllo se ci sia già un UDC per company / flusso anno +BEGIN TRAN + -- cerco nella tab contatori UDC l'ultimo valido + SET @numUdc = ( + SELECT count(*) + FROM ContatoriUdc + WHERE CodCS = @CodCS + AND Flusso = @Flusso + AND Anno = @Anno + ) + -- controllo se record c'è... + IF(@numUdc > 0) + BEGIN + -- se c'è incremento di 1 in tab + UPDATE ContatoriUdc + SET LastIdx = LastIdx + 1 + WHERE CodCS = @CodCS + AND Flusso = @Flusso + AND Anno = @Anno + END + ELSE + BEGIN + -- lo creo! + INSERT INTO ContatoriUdc(CodCS, Flusso, Anno, LastIdx) + VALUES (@CodCS, @Flusso, @Anno, 1) + END + -- aggiorno numero UDC + SET @numUdc = ( + SELECT LastIdx + FROM ContatoriUdc + WHERE CodCS = @CodCS + AND Flusso = @Flusso + AND Anno = @Anno + ) +COMMIT TRAN +------------------------------------------------------------------------------------------------------ + +------------------------------------------------------------------------------------------------------ +-- Ciclo principale x inserimento nuovo record +------------------------------------------------------------------------------------------------------ +-- ottengo il nuovo codice UDC completo +--SET @UDC = 'U' + @CodCS + @Flusso + @Anno + dbo.f_padLeft(CAST(@numUdc AS VARCHAR(6)), 6, '0') +SET @UDC = dbo.componiUdc(@CodCS, @Flusso, @Anno, @numUdc) + +-- inserisco un nuovo record +INSERT INTO ElencoCartellini(CodCS, UDC, Tara, IdxPosizione, Qta, CodImballo, CodSoggetto, CreateDate, ModDate) +VALUES (@CodCS, @UDC, @Tara, 0, 0, @CodImballo, @CodSoggetto, GETDATE(), GETDATE()) +------------------------------------------------------------------------------------------------------ + +------------------------------------------------------------------------------------------------------ +-- restituisco la tab dati con l'udc appena inserito +------------------------------------------------------------------------------------------------------ +SELECT * +FROM ElencoCartellini +WHERE UDC = @UDC +------------------------------------------------------------------------------------------------------ + +RETURN + +GO + diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 2deadab7..2c863de8 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 c7b159f2..96e0b0c7 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 98611702..e7f52807 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 2deadab7..2c863de8 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 b0355add..eaf62d55 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_Utility.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_Utility.Designer.cs.dll index e8dcc8aa..92330d14 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/Debug/TempPE/DS_magazzino.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll index f9780139..a63b8e1b 100644 Binary files a/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll and b/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.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 98611702..e7f52807 100644 Binary files a/GMW/GMW_data/obj/Release/GMW_data.dll and b/GMW/GMW_data/obj/Release/GMW_data.dll differ