diff --git a/GMW/GMW/WS/AutoCompletamento.asmx.cs b/GMW/GMW/WS/AutoCompletamento.asmx.cs index 03980fa6..7243aa67 100644 --- a/GMW/GMW/WS/AutoCompletamento.asmx.cs +++ b/GMW/GMW/WS/AutoCompletamento.asmx.cs @@ -19,6 +19,24 @@ namespace GMW.WS public class AutoCompletamento : System.Web.Services.WebService { + [System.Web.Services.WebMethod] + public string[] elencoAnime(string prefixText, int count) + { + // inizializzo risposta + List suggerimenti = new List(); + // proseguo SOLO SE min "MinCharAutocomplete" char... + if (count >= memLayer.ML.confReadInt("MinCharAutocomplete")) + { + // elenco candidati + DS_Utility.v_selParticolariDataTable tabParticolari = utils.obj.taSelPart.getByConditioPref("A", prefixText); + // aggiungo ogni riga... + foreach (DS_Utility.v_selParticolariRow riga in tabParticolari) + { + suggerimenti.Add(riga.value); + } + } + return suggerimenti.ToArray(); + } [System.Web.Services.WebMethod] public string[] elencoParticolari(string prefixText, int count) { @@ -28,11 +46,11 @@ namespace GMW.WS if (count >= memLayer.ML.confReadInt("MinCharAutocomplete")) { // elenco candidati - DS_magazzino.V_ParticolariOverviewDataTable tabParticolari = MagClass.magazzino.taVParticolariOverwiew.getByLikePrefix(prefixText, memLayer.ML.confReadString("CodCS")); + DS_Utility.v_selParticolariDataTable tabParticolari = utils.obj.taSelPart.getByConditioPref("P", prefixText); // aggiungo ogni riga... - foreach (DS_magazzino.V_ParticolariOverviewRow riga in tabParticolari) + foreach (DS_Utility.v_selParticolariRow riga in tabParticolari) { - suggerimenti.Add(riga.Particolare); + suggerimenti.Add(riga.value); } } return suggerimenti.ToArray(); @@ -55,6 +73,6 @@ namespace GMW.WS } return suggerimenti.ToArray(); } - + } } diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config index 3a14462e..8acad9f1 100644 --- a/GMW/GMW/Web.config +++ b/GMW/GMW/Web.config @@ -60,7 +60,7 @@ - + diff --git a/GMW/GMW/WebUserControls/mod_UdcCella.ascx b/GMW/GMW/WebUserControls/mod_UdcCella.ascx index 17ad7d05..870f5ac4 100644 --- a/GMW/GMW/WebUserControls/mod_UdcCella.ascx +++ b/GMW/GMW/WebUserControls/mod_UdcCella.ascx @@ -63,7 +63,8 @@ - +    @@ -104,7 +105,8 @@ + MinimumPrefixLength="2" CompletionInterval="200" ServicePath="~/WS/AutoCompletamento.asmx" + ServiceMethod="elencoCelle" /> diff --git a/GMW/GMW/WebUserControls/mod_UdcCella.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_UdcCella.ascx.designer.cs index 93cfd335..374ffdb3 100644 --- a/GMW/GMW/WebUserControls/mod_UdcCella.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_UdcCella.ascx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 +// Runtime Version:2.0.50727.4963 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/GMW/GMW/WebUserControls/mod_anime.ascx b/GMW/GMW/WebUserControls/mod_anime.ascx index 0c8a5a62..1f1c36da 100644 --- a/GMW/GMW/WebUserControls/mod_anime.ascx +++ b/GMW/GMW/WebUserControls/mod_anime.ascx @@ -48,7 +48,8 @@ + MinimumPrefixLength="2" CompletionInterval="200" ServicePath="~/WS/AutoCompletamento.asmx" + ServiceMethod="elencoAnime" />
diff --git a/GMW/GMW/WebUserControls/mod_execUDC.ascx b/GMW/GMW/WebUserControls/mod_execUDC.ascx index 6bdfe0f7..ea0e0f03 100644 --- a/GMW/GMW/WebUserControls/mod_execUDC.ascx +++ b/GMW/GMW/WebUserControls/mod_execUDC.ascx @@ -43,7 +43,8 @@ + MinimumPrefixLength="2" CompletionInterval="200" ServicePath="~/WS/AutoCompletamento.asmx" + ServiceMethod="elencoCelle" /> diff --git a/GMW/GMW/WebUserControls/mod_execUDC.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_execUDC.ascx.designer.cs index 9e0f142a..656d0f74 100644 --- a/GMW/GMW/WebUserControls/mod_execUDC.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_execUDC.ascx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 +// Runtime Version:2.0.50727.4963 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx b/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx index d9d255d3..1aa96917 100644 --- a/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx +++ b/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx @@ -28,7 +28,8 @@ DataValueField="value" AutoPostBack="True" OnSelectedIndexChanged="ddlTipoLista_SelectedIndexChanged"> + SelectMethod="GetData" TypeName="GMW_data.DS_UtilityTableAdapters.v_selTipoListaTableAdapter"> + + MinimumPrefixLength="2" CompletionInterval="200" ServicePath="~/WS/AutoCompletamento.asmx" + ServiceMethod="elencoParticolari" /> + MinimumPrefixLength="2" CompletionInterval="200" ServicePath="~/WS/AutoCompletamento.asmx" + ServiceMethod="elencoParticolari" />
diff --git a/GMW/GMW/WebUserControls/mod_sanpos_consumoF10.ascx b/GMW/GMW/WebUserControls/mod_sanpos_consumoF10.ascx index d0bad611..aea68686 100644 --- a/GMW/GMW/WebUserControls/mod_sanpos_consumoF10.ascx +++ b/GMW/GMW/WebUserControls/mod_sanpos_consumoF10.ascx @@ -33,7 +33,8 @@ + ServicePath="~/WS/AutoCompletamento.asmx" ServiceMethod="elencoParticolari" MinimumPrefixLength="2" + CompletionInterval="200" />
diff --git a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx index 95ea8cfa..07c756cc 100644 --- a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx +++ b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx @@ -66,7 +66,8 @@

- +

@@ -78,9 +79,11 @@

- + + ServicePath="~/WS/AutoCompletamento.asmx" ServiceMethod="elencoParticolari" MinimumPrefixLength="2" + CompletionInterval="200" />
diff --git a/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx index 18bdd099..a99eb779 100644 --- a/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx +++ b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx @@ -12,7 +12,8 @@
- +
@@ -32,7 +33,8 @@

- +

@@ -45,9 +47,10 @@
+ AutoPostBack="True" Style="text-align: center" /> + ServicePath="~/WS/AutoCompletamento.asmx" ServiceMethod="elencoParticolari" MinimumPrefixLength="2" + CompletionInterval="200" />
diff --git a/GMW/GMW/WebUserControls/mod_statoMag.ascx b/GMW/GMW/WebUserControls/mod_statoMag.ascx index cc74efc2..dbaf0e4a 100644 --- a/GMW/GMW/WebUserControls/mod_statoMag.ascx +++ b/GMW/GMW/WebUserControls/mod_statoMag.ascx @@ -43,6 +43,9 @@ +
+ +
diff --git a/GMW/GMW/WebUserControls/mod_statoMag.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_statoMag.ascx.designer.cs index 8d550363..b7b2c294 100644 --- a/GMW/GMW/WebUserControls/mod_statoMag.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_statoMag.ascx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 +// Runtime Version:2.0.50727.4963 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 7c163d01..b7819a97 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 065e5f94..75d766d5 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 fd4857f0..e208bb81 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 361856be..316d2193 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 d19dc2cd..5b1965eb 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 5ee7443a..08b91662 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 7e5014fb..f967279e 100644 --- a/GMW/GMW/mazzAppSettingsTK_test.config +++ b/GMW/GMW/mazzAppSettingsTK_test.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 7c163d01..8e6761be 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 376d3548..488ce6c9 100644 Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW/obj/Release/GMW.dll b/GMW/GMW/obj/Release/GMW.dll index 5bc36d5b..b7819a97 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 f020ccab..36581770 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/Barcode.aspx.cs b/GMW/GMW_Term/Barcode.aspx.cs index e8b06d69..09977acd 100644 --- a/GMW/GMW_Term/Barcode.aspx.cs +++ b/GMW/GMW_Term/Barcode.aspx.cs @@ -22,6 +22,9 @@ namespace GMW_Term mod_barcode1.eh_scannedCella += new EventHandler(mod_barcode1_eh_scannedCella); mod_barcode1.eh_resetUser += new EventHandler(mod_barcode1_eh_resetUser); checkVisibility(); + // imposto btnHome + mod_barcode1.homeBtnText = "btnTermMenuLDP"; + mod_barcode1.homeBtnLink = "~/menuLDP.aspx"; } /// /// controlla visibilità lista di prelievo (se non c'è user ins essione non mostra LDP) diff --git a/GMW/GMW_Term/ListePrelievo.aspx.cs b/GMW/GMW_Term/ListePrelievo.aspx.cs index 20071896..6a50e4f2 100644 --- a/GMW/GMW_Term/ListePrelievo.aspx.cs +++ b/GMW/GMW_Term/ListePrelievo.aspx.cs @@ -10,7 +10,9 @@ namespace GMW_Term { protected void Page_Load(object sender, EventArgs e) { - + // imposto btnHome + mod_listePrelievo1.homeBtnText = "btnTermMenuLDP"; + mod_listePrelievo1.homeBtnLink = "~/menuLDP.aspx"; } } } diff --git a/GMW/GMW_Term/SmartList.aspx.cs b/GMW/GMW_Term/SmartList.aspx.cs index 3b37eb14..e0002730 100644 --- a/GMW/GMW_Term/SmartList.aspx.cs +++ b/GMW/GMW_Term/SmartList.aspx.cs @@ -18,6 +18,9 @@ namespace GMW_Term mod_barcode1.eh_scannedUdc += new EventHandler(mod_barcode1_eh_scannedUdc); mod_barcode1.eh_scannedUser += new EventHandler(mod_barcode1_eh_scannedUser); mod_barcode1.eh_resetUser += new EventHandler(mod_barcode1_eh_resetUser); + // imposto btnHome + mod_barcode1.homeBtnText = "btnTermMenuLDP"; + mod_barcode1.homeBtnLink = "~/menuLDP.aspx"; } void mod_barcode1_eh_resetUser(object sender, EventArgs e) diff --git a/GMW/GMW_Term/Web.config b/GMW/GMW_Term/Web.config index 6d45e25f..ac6403e3 100644 --- a/GMW/GMW_Term/Web.config +++ b/GMW/GMW_Term/Web.config @@ -58,7 +58,7 @@ - + diff --git a/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs index c52fae87..ecb42414 100644 --- a/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs @@ -13,6 +13,9 @@ namespace GMW_Term.WebUserControls { // variabile per verificare se è operatore bool _validUserInSession = false; + string _homeBtnText = "Home"; + string _homeBtnLink = "~/Home.aspx"; + /// /// wrapper traduzione termini @@ -35,6 +38,48 @@ namespace GMW_Term.WebUserControls #endregion + /// + /// testo del pulsante HOME + /// + public string homeBtnText + { + set + { + _homeBtnText = value; + traduciObj(); + } + get + { + return _homeBtnText; + } + } + /// + /// link del pulsante HOME + /// + public string homeBtnLink + { + set + { + _homeBtnLink = value; + traduciObj(); + } + get + { + return _homeBtnLink; + } + } + /// + /// traduce stringhe oggetti + /// + protected void traduciObj() + { + // scrive label e text bottoni + btnLoginPage.Text = string.Format("{0}\n[Alt+{1}]", traduci("Login"), 7); + btnLoginPage.AccessKey = "7"; + btnButtonsHome.Text = string.Format("{0}\n[Alt+{1}]", traduci(_homeBtnText), 9); + btnButtonsHome.AccessKey = "9"; + } + /// /// metodi al caricamento della pagina /// @@ -42,16 +87,13 @@ namespace GMW_Term.WebUserControls /// protected void Page_Load(object sender, EventArgs e) { - // scrive label e text bottoni - btnLoginPage.Text = "[7]-Login"; - btnLoginPage.AccessKey = "7"; - btnButtonsHome.Text = "[9]-Home"; - btnButtonsHome.AccessKey = "9"; + traduciObj(); + // se username è valorizzato... verificaOperatoreInSessione(); if (_validUserInSession) { - btnLoginPage.Text = "[7]-LogOut"; + btnLoginPage.Text = string.Format("{0}\n[Alt+{1}]", traduci("Logout"), 7); btnLoginPage.Visible = memLayer.ML.confReadBool("showLogout"); btnButtonsHome.Visible = true; // se ho un precedente valore barcode lo mostro... @@ -362,7 +404,7 @@ namespace GMW_Term.WebUserControls /// protected void btnButtonsHome_Click(object sender, EventArgs e) { - Response.Redirect("Home.aspx"); + Response.Redirect(homeBtnLink); } /// /// Verifica se c'è un valore in sessione di tipo operatore diff --git a/GMW/GMW_Term/WebUserControls/mod_home.ascx b/GMW/GMW_Term/WebUserControls/mod_home.ascx index ed92d913..b1d6c4dc 100644 --- a/GMW/GMW_Term/WebUserControls/mod_home.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_home.ascx @@ -1,9 +1,15 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_home.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_home" %> -
- +
+
-
+
+
-
- +
+
+
+ +
+
+  
diff --git a/GMW/GMW_Term/WebUserControls/mod_home.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_home.ascx.cs index be7c5b22..8c7bc4b8 100644 --- a/GMW/GMW_Term/WebUserControls/mod_home.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_home.ascx.cs @@ -27,17 +27,37 @@ namespace GMW_Term.WebUserControls btn1.AccessKey = "2"; btn2.Text = string.Format("{0}\n[Alt+{1}]", traduci("btnTermMenuMov"), 8); btn2.AccessKey = "8"; + btn3.Text = string.Format("{0}\n[Alt+{1}]", traduci("btnLogout"), 0); + btn3.AccessKey = "0"; } - + /// + /// vado menù LDP + /// + /// + /// protected void btn1_Click(object sender, EventArgs e) { Response.Redirect("MenuLDP.aspx"); } - + /// + /// vado menù movimenti + /// + /// + /// protected void btn2_Click(object sender, EventArgs e) { Response.Redirect("MenuMov.aspx"); } + /// + /// reset e login + /// + /// + /// + protected void btn3_Click(object sender, EventArgs e) + { + TermUtils.TU.forceLogOut(); + Response.Redirect("Barcode.aspx"); + } } } diff --git a/GMW/GMW_Term/WebUserControls/mod_home.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_home.ascx.designer.cs index 64692c41..9f043b45 100644 --- a/GMW/GMW_Term/WebUserControls/mod_home.ascx.designer.cs +++ b/GMW/GMW_Term/WebUserControls/mod_home.ascx.designer.cs @@ -30,5 +30,14 @@ namespace GMW_Term.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Button btn2; + + /// + /// btn3 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btn3; } } diff --git a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs index 659e2610..9af90bf4 100644 --- a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs @@ -241,6 +241,38 @@ namespace GMW_Term.WebUserControls #endregion + string _homeBtnText = "Home"; + string _homeBtnLink = "~/Home.aspx"; + /// + /// testo del pulsante HOME + /// + public string homeBtnText + { + set + { + _homeBtnText = value; + traduciObj(); + } + get + { + return _homeBtnText; + } + } + /// + /// link del pulsante HOME + /// + public string homeBtnLink + { + set + { + _homeBtnLink = value; + traduciObj(); + } + get + { + return _homeBtnLink; + } + } // variabile per verificare se è operatore bool _validUserInSession = false; @@ -258,6 +290,23 @@ namespace GMW_Term.WebUserControls _validUserInSession = true; } } + /// + /// traduce stringhe oggetti + /// + protected void traduciObj() + { + // scrive label e text bottoni + btnLoginPage.Text = string.Format("{0}\n[Alt+{1}]", traduci("Logout"), 7); + btnLoginPage.AccessKey = "7"; + btnButtonsHome.Text = string.Format("{0}\n[Alt+{1}]", traduci(_homeBtnText), 9); + btnButtonsHome.AccessKey = "9"; + btnShowPeriodo.Text = string.Format("{0}\n[Alt+{1}]", traduci("ImpostaPeriodo"), 8); + btnShowPeriodo.AccessKey = "8"; + btnCloseDet.Text = string.Format("{0}\n[Alt+{1}]", traduci("Close"), 3); + btnCloseDet.AccessKey = "3"; + btnBarcode.Text = string.Format("{0}\n[Alt+{1}]", traduci("Barcode"), 1); + btnBarcode.AccessKey = "1"; + } /// /// metodi al caricamento della pagina @@ -266,17 +315,7 @@ namespace GMW_Term.WebUserControls /// protected void Page_Load(object sender, EventArgs e) { - // scrive label e text bottoni - btnShowPeriodo.Text = "[8] - Imposta periodo"; - btnShowPeriodo.AccessKey = "8"; - btnLoginPage.Text = "[7]-LogOut"; - btnLoginPage.AccessKey = "7"; - btnButtonsHome.Text = "[9]-Home"; - btnButtonsHome.AccessKey = "9"; - btnCloseDet.Text = "[3]-" + traduci("Close"); - btnCloseDet.AccessKey = "3"; - btnBarcode.Text = "[1]-Barcode"; - btnBarcode.AccessKey = "1"; + traduciObj(); // se username è valorizzato... verificaOperatoreInSessione(); if (_validUserInSession) @@ -838,7 +877,7 @@ namespace GMW_Term.WebUserControls /// protected void btnButtonsHome_Click(object sender, EventArgs e) { - Response.Redirect("~/Home.aspx"); + Response.Redirect(homeBtnLink); } /// /// nasconde dettagli diff --git a/GMW/GMW_Term/WebUserControls/mod_menuLDP.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_menuLDP.ascx.cs index 59f9b5a7..6c69d0c0 100644 --- a/GMW/GMW_Term/WebUserControls/mod_menuLDP.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_menuLDP.ascx.cs @@ -5,6 +5,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; using SteamWare; +using GMW_data; namespace GMW_Term.WebUserControls { @@ -23,7 +24,6 @@ namespace GMW_Term.WebUserControls protected void Page_Load(object sender, EventArgs e) { // scrive label e text bottoni - btn1.Text = string.Format("{0}\n[Alt+{1}]", traduci("btnTermTakeListBarcode"), 1); btn1.AccessKey = "1"; btn2.Text = string.Format("{0}\n[Alt+{1}]", traduci("btnTermTakeListHome"), 3); @@ -32,6 +32,38 @@ namespace GMW_Term.WebUserControls btn3.AccessKey = "7"; btn4.Text = string.Format("{0}\n[Alt+{1}]", traduci("btnTermSmartList"), 9); btn4.AccessKey = "9"; + checkLavoriInCorso(); + } + /// + /// verifica se ci siano in corso smartList o LDP normali e disabilita il contrario + /// + private void checkLavoriInCorso() + { + bool hasSmartList = false; + try + { + hasSmartList = (MagClass.magazzino.taElencoListePrelievo.getOpenByUserTipo(MagClass.magazzino.CodSoggCurrUser, "00-Smart").Rows.Count > 0); + } + catch + { } + if (hasSmartList) + { + // smartList attiva + btn1.Enabled = false; + btn3.Enabled = false; + } + else if (memLayer.ML.isInSessionObject("CodListaAttiva")) + { + // LDP tradizionale attiva + btn4.Enabled = false; + } + else + { + // niente attivo! + btn1.Enabled = true; + btn3.Enabled = true; + btn4.Enabled = true; + } } protected void btn1_Click(object sender, EventArgs e) diff --git a/GMW/GMW_Term/WebUserControls/mod_processPackList.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_processPackList.ascx.cs index 5b650a9a..cdfc583d 100644 --- a/GMW/GMW_Term/WebUserControls/mod_processPackList.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_processPackList.ascx.cs @@ -32,22 +32,32 @@ namespace GMW_Term.WebUserControls // recupero barcode e controllo sia valido string barcode = memLayer.ML.StringSessionObj("UDC_sel"); bool barcodeOk = MagClass.magazzino.checkUDC(barcode); - if (barcodeOk) + bool udcPrelevabile = (MagClass.magazzino.taRigheListePrelievo.getPrelevateByUdc(barcode).Rows.Count == 0); + if (udcPrelevabile) { - // controllo se barcode è ok x LDP corrente... - if (MagClass.magazzino.verificaDatiUdc(MagClass.magazzino.codListaAttivaUtente, barcode)) + if (barcodeOk) { - MagClass.magazzino.confermaUdcPrelevatoPerLista(MagClass.magazzino.codListaAttivaUtente, barcode); - lblErrore.Visible = false; + // controllo se barcode è ok x LDP corrente... + if (MagClass.magazzino.verificaDatiUdc(MagClass.magazzino.codListaAttivaUtente, barcode)) + { + MagClass.magazzino.confermaUdcPrelevatoPerLista(MagClass.magazzino.codListaAttivaUtente, barcode); + lblErrore.Visible = false; + } + else + { + // salvo errore + lblErrore.Visible = true; + lblErrore.Text = traduci("BarcodeNonValidoLDP"); + } + // svuoto barcode selezionato + memLayer.ML.emptySessionVal("Barcode_sel"); } - else - { - // salvo errore - lblErrore.Visible = true; - lblErrore.Text = traduci("BarcodeNonValidoLDP"); - } - // svuoto barcode selezionato - memLayer.ML.emptySessionVal("Barcode_sel"); + } + else + { + // indico barcode già caricato + lblErrore.Visible = true; + lblErrore.Text = string.Format("{0}: {1}", barcode, traduci("udcGiaPrelevato")); } //update visualizzazione lblListaAttiva.Text = traduci("ListaPrel"); diff --git a/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs index 8f42b70a..c8ee7ea2 100644 --- a/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs @@ -38,7 +38,7 @@ namespace GMW_Term.WebUserControls string barcode = memLayer.ML.StringSessionObj("UDC_sel"); string particolare = ""; bool barcodeOk = MagClass.magazzino.checkUDC(barcode); - bool udcPrelevabile = (MagClass.magazzino.taRigheListePrelievo.getPrelevateByUdc(barcode).Rows.Count < 1); + bool udcPrelevabile = (MagClass.magazzino.taRigheListePrelievo.getPrelevateByUdc(barcode).Rows.Count == 0); if (barcodeOk && udcPrelevabile) { try @@ -160,6 +160,9 @@ namespace GMW_Term.WebUserControls MagClass.magazzino.taRigheListePrelievo.stp_RLP_deleteFromCodLista(riga.CodLista); // elimino lista MagClass.magazzino.taElencoListePrelievo.DeleteQuery(riga.CodLista); + // elimino task attivo e cod lista attuale + memLayer.ML.emptySessionVal("CodListaAttiva"); + memLayer.ML.emptySessionVal("activeTask"); } catch { } diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index 2d1c6d02..9e02e04b 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 927a5d72..a00fd41f 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/interrMov.aspx.cs b/GMW/GMW_Term/interrMov.aspx.cs index 52884f80..eb112b50 100644 --- a/GMW/GMW_Term/interrMov.aspx.cs +++ b/GMW/GMW_Term/interrMov.aspx.cs @@ -19,6 +19,9 @@ namespace GMW_Term mod_barcode1.eh_scannedUdc += new EventHandler(mod_barcode1_eh_scannedUdc); mod_barcode1.eh_scannedCella += new EventHandler(mod_barcode1_eh_scannedCella); checkVisibility(); + // imposto btnHome + mod_barcode1.homeBtnText = "btnTermMenuMov"; + mod_barcode1.homeBtnLink = "~/MenuMov.aspx"; } /// /// controllo visibilità dati valori in sessione diff --git a/GMW/GMW_Term/makeMov.aspx.cs b/GMW/GMW_Term/makeMov.aspx.cs index 2bf5366f..a5d3e8e1 100644 --- a/GMW/GMW_Term/makeMov.aspx.cs +++ b/GMW/GMW_Term/makeMov.aspx.cs @@ -17,6 +17,9 @@ namespace GMW_Term // imposto controllo valori scansionati mod_barcode1.eh_scannedUdc += new EventHandler(mod_barcode1_eh_scannedUdc); mod_barcode1.eh_scannedCella += new EventHandler(mod_barcode1_eh_scannedCella); + // imposto btnHome + mod_barcode1.homeBtnText = "btnTermMenuMov"; + mod_barcode1.homeBtnLink = "~/MenuMov.aspx"; } void mod_barcode1_eh_scannedCella(object sender, EventArgs e) { diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index dada6bab..e3ac3bf3 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 829c2e72..8436dae0 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 b1ca1160..7640d7a8 100644 --- a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj +++ b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj @@ -344,14 +344,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMWT" - "ProductCode" = "8:{FA3C0ABA-85AA-4657-8986-F628BBD906C8}" - "PackageCode" = "8:{5B95E951-C332-450D-9217-A74ED78E85A6}" + "ProductCode" = "8:{6CD3FC34-539E-41F3-9374-394EF05EAB00}" + "PackageCode" = "8:{00EB130E-692D-454C-9FD3-63A4B5DDC56A}" "UpgradeCode" = "8:{B348C50D-8DAD-4430-AEF0-60800C94CB78}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.1.426" + "ProductVersion" = "8:1.1.428" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" diff --git a/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi b/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi index 9f7d2378..76aa275b 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 e34c9b51..e3aa0cd6 100644 --- a/GMW/GMW_data/DS_Utility.Designer.cs +++ b/GMW/GMW_data/DS_Utility.Designer.cs @@ -53,6 +53,8 @@ namespace GMW_data { private AS400_ComandiDataTable tableAS400_Comandi; + private v_selParticolariDataTable tablev_selParticolari; + private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -121,6 +123,9 @@ namespace GMW_data { if ((ds.Tables["AS400_Comandi"] != null)) { base.Tables.Add(new AS400_ComandiDataTable(ds.Tables["AS400_Comandi"])); } + if ((ds.Tables["v_selParticolari"] != null)) { + base.Tables.Add(new v_selParticolariDataTable(ds.Tables["v_selParticolari"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -265,6 +270,15 @@ namespace GMW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Browsable(false)] + [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] + public v_selParticolariDataTable v_selParticolari { + get { + return this.tablev_selParticolari; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.BrowsableAttribute(true)] [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Visible)] @@ -366,6 +380,9 @@ namespace GMW_data { if ((ds.Tables["AS400_Comandi"] != null)) { base.Tables.Add(new AS400_ComandiDataTable(ds.Tables["AS400_Comandi"])); } + if ((ds.Tables["v_selParticolari"] != null)) { + base.Tables.Add(new v_selParticolariDataTable(ds.Tables["v_selParticolari"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -480,6 +497,12 @@ namespace GMW_data { this.tableAS400_Comandi.InitVars(); } } + this.tablev_selParticolari = ((v_selParticolariDataTable)(base.Tables["v_selParticolari"])); + if ((initTable == true)) { + if ((this.tablev_selParticolari != null)) { + this.tablev_selParticolari.InitVars(); + } + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -517,6 +540,8 @@ namespace GMW_data { base.Tables.Add(this.tablev_selDestinatariListePrelievo); this.tableAS400_Comandi = new AS400_ComandiDataTable(); base.Tables.Add(this.tableAS400_Comandi); + this.tablev_selParticolari = new v_selParticolariDataTable(); + base.Tables.Add(this.tablev_selParticolari); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -589,6 +614,11 @@ namespace GMW_data { return false; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + private bool ShouldSerializev_selParticolari() { + return false; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) { if ((e.Action == global::System.ComponentModel.CollectionChangeAction.Remove)) { @@ -670,6 +700,8 @@ namespace GMW_data { public delegate void AS400_ComandiRowChangeEventHandler(object sender, AS400_ComandiRowChangeEvent e); + public delegate void v_selParticolariRowChangeEventHandler(object sender, v_selParticolariRowChangeEvent e); + /// ///Represents the strongly named DataTable class. /// @@ -4356,6 +4388,268 @@ namespace GMW_data { } } + /// + ///Represents the strongly named DataTable class. + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")] + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class v_selParticolariDataTable : global::System.Data.TypedTableBase { + + private global::System.Data.DataColumn columnvalue; + + private global::System.Data.DataColumn columnlabel; + + private global::System.Data.DataColumn columnconditio; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public v_selParticolariDataTable() { + this.TableName = "v_selParticolari"; + this.BeginInit(); + this.InitClass(); + this.EndInit(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + internal v_selParticolariDataTable(global::System.Data.DataTable table) { + this.TableName = table.TableName; + if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { + this.CaseSensitive = table.CaseSensitive; + } + if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { + this.Locale = table.Locale; + } + if ((table.Namespace != table.DataSet.Namespace)) { + this.Namespace = table.Namespace; + } + this.Prefix = table.Prefix; + this.MinimumCapacity = table.MinimumCapacity; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + protected v_selParticolariDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context) { + this.InitVars(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.DataColumn valueColumn { + get { + return this.columnvalue; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.DataColumn labelColumn { + get { + return this.columnlabel; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.DataColumn conditioColumn { + get { + return this.columnconditio; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Browsable(false)] + public int Count { + get { + return this.Rows.Count; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public v_selParticolariRow this[int index] { + get { + return ((v_selParticolariRow)(this.Rows[index])); + } + } + + public event v_selParticolariRowChangeEventHandler v_selParticolariRowChanging; + + public event v_selParticolariRowChangeEventHandler v_selParticolariRowChanged; + + public event v_selParticolariRowChangeEventHandler v_selParticolariRowDeleting; + + public event v_selParticolariRowChangeEventHandler v_selParticolariRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public void Addv_selParticolariRow(v_selParticolariRow row) { + this.Rows.Add(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public v_selParticolariRow Addv_selParticolariRow(string value, string label, string conditio) { + v_selParticolariRow rowv_selParticolariRow = ((v_selParticolariRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + value, + label, + conditio}; + rowv_selParticolariRow.ItemArray = columnValuesArray; + this.Rows.Add(rowv_selParticolariRow); + return rowv_selParticolariRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public v_selParticolariRow FindByvalue(string value) { + return ((v_selParticolariRow)(this.Rows.Find(new object[] { + value}))); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public override global::System.Data.DataTable Clone() { + v_selParticolariDataTable cln = ((v_selParticolariDataTable)(base.Clone())); + cln.InitVars(); + return cln; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + protected override global::System.Data.DataTable CreateInstance() { + return new v_selParticolariDataTable(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + internal void InitVars() { + this.columnvalue = base.Columns["value"]; + this.columnlabel = base.Columns["label"]; + this.columnconditio = base.Columns["conditio"]; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + private void InitClass() { + this.columnvalue = new global::System.Data.DataColumn("value", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnvalue); + this.columnlabel = new global::System.Data.DataColumn("label", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnlabel); + this.columnconditio = new global::System.Data.DataColumn("conditio", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnconditio); + this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { + this.columnvalue}, true)); + this.columnvalue.AllowDBNull = false; + this.columnvalue.Unique = true; + this.columnvalue.MaxLength = 15; + this.columnlabel.MaxLength = 30; + this.columnconditio.MaxLength = 1; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public v_selParticolariRow Newv_selParticolariRow() { + return ((v_selParticolariRow)(this.NewRow())); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + return new v_selParticolariRow(builder); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + protected override global::System.Type GetRowType() { + return typeof(v_selParticolariRow); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanged(e); + if ((this.v_selParticolariRowChanged != null)) { + this.v_selParticolariRowChanged(this, new v_selParticolariRowChangeEvent(((v_selParticolariRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanging(e); + if ((this.v_selParticolariRowChanging != null)) { + this.v_selParticolariRowChanging(this, new v_selParticolariRowChangeEvent(((v_selParticolariRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleted(e); + if ((this.v_selParticolariRowDeleted != null)) { + this.v_selParticolariRowDeleted(this, new v_selParticolariRowChangeEvent(((v_selParticolariRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleting(e); + if ((this.v_selParticolariRowDeleting != null)) { + this.v_selParticolariRowDeleting(this, new v_selParticolariRowChangeEvent(((v_selParticolariRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public void Removev_selParticolariRow(v_selParticolariRow row) { + this.Rows.Remove(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { + global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); + global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); + DS_Utility ds = new DS_Utility(); + global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny(); + any1.Namespace = "http://www.w3.org/2001/XMLSchema"; + any1.MinOccurs = new decimal(0); + any1.MaxOccurs = decimal.MaxValue; + any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any1); + global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny(); + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1"; + any2.MinOccurs = new decimal(1); + any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any2); + global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute1.Name = "namespace"; + attribute1.FixedValue = ds.Namespace; + type.Attributes.Add(attribute1); + global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute2.Name = "tableTypeName"; + attribute2.FixedValue = "v_selParticolariDataTable"; + type.Attributes.Add(attribute2); + type.Particle = sequence; + global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); + if (xs.Contains(dsSchema.TargetNamespace)) { + global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); + global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); + try { + global::System.Xml.Schema.XmlSchema schema = null; + dsSchema.Write(s1); + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { + schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); + s2.SetLength(0); + schema.Write(s2); + if ((s1.Length == s2.Length)) { + s1.Position = 0; + s2.Position = 0; + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte())); ) { + ; + } + if ((s1.Position == s1.Length)) { + return type; + } + } + } + } + finally { + if ((s1 != null)) { + s1.Close(); + } + if ((s2 != null)) { + s2.Close(); + } + } + } + xs.Add(dsSchema); + return type; + } + } + /// ///Represents strongly named DataRow class. /// @@ -5391,6 +5685,81 @@ namespace GMW_data { } } + /// + ///Represents strongly named DataRow class. + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")] + public partial class v_selParticolariRow : global::System.Data.DataRow { + + private v_selParticolariDataTable tablev_selParticolari; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + internal v_selParticolariRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tablev_selParticolari = ((v_selParticolariDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public string value { + get { + return ((string)(this[this.tablev_selParticolari.valueColumn])); + } + set { + this[this.tablev_selParticolari.valueColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public string label { + get { + try { + return ((string)(this[this.tablev_selParticolari.labelColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'label\' in table \'v_selParticolari\' is DBNull.", e); + } + } + set { + this[this.tablev_selParticolari.labelColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public string conditio { + get { + try { + return ((string)(this[this.tablev_selParticolari.conditioColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'conditio\' in table \'v_selParticolari\' is DBNull.", e); + } + } + set { + this[this.tablev_selParticolari.conditioColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public bool IslabelNull() { + return this.IsNull(this.tablev_selParticolari.labelColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public void SetlabelNull() { + this[this.tablev_selParticolari.labelColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public bool IsconditioNull() { + return this.IsNull(this.tablev_selParticolari.conditioColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public void SetconditioNull() { + this[this.tablev_selParticolari.conditioColumn] = global::System.Convert.DBNull; + } + } + /// ///Row event argument class /// @@ -5824,6 +6193,37 @@ namespace GMW_data { } } } + + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")] + public class v_selParticolariRowChangeEvent : global::System.EventArgs { + + private v_selParticolariRow eventRow; + + private global::System.Data.DataRowAction eventAction; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public v_selParticolariRowChangeEvent(v_selParticolariRow row, global::System.Data.DataRowAction action) { + this.eventRow = row; + this.eventAction = action; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public v_selParticolariRow Row { + get { + return this.eventRow; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.DataRowAction Action { + get { + return this.eventAction; + } + } + } } } namespace GMW_data.DS_UtilityTableAdapters { @@ -9055,6 +9455,216 @@ namespace GMW_data.DS_UtilityTableAdapters { } } + /// + ///Represents the connection and commands used to retrieve and save data. + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")] + [global::System.ComponentModel.DesignerCategoryAttribute("code")] + [global::System.ComponentModel.ToolboxItem(true)] + [global::System.ComponentModel.DataObjectAttribute(true)] + [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + + ", Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public partial class v_selParticolariTableAdapter : global::System.ComponentModel.Component { + + private global::System.Data.SqlClient.SqlDataAdapter _adapter; + + private global::System.Data.SqlClient.SqlConnection _connection; + + private global::System.Data.SqlClient.SqlTransaction _transaction; + + private global::System.Data.SqlClient.SqlCommand[] _commandCollection; + + private bool _clearBeforeFill; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public v_selParticolariTableAdapter() { + this.ClearBeforeFill = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { + get { + if ((this._adapter == null)) { + this.InitAdapter(); + } + return this._adapter; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.SqlClient.SqlConnection Connection { + get { + if ((this._connection == null)) { + this.InitConnection(); + } + return this._connection; + } + set { + this._connection = value; + if ((this.Adapter.InsertCommand != null)) { + this.Adapter.InsertCommand.Connection = value; + } + if ((this.Adapter.DeleteCommand != null)) { + this.Adapter.DeleteCommand.Connection = value; + } + if ((this.Adapter.UpdateCommand != null)) { + this.Adapter.UpdateCommand.Connection = value; + } + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + if ((this.CommandCollection[i] != null)) { + ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value; + } + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + internal global::System.Data.SqlClient.SqlTransaction Transaction { + get { + return this._transaction; + } + set { + this._transaction = value; + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + this.CommandCollection[i].Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.DeleteCommand != null))) { + this.Adapter.DeleteCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.InsertCommand != null))) { + this.Adapter.InsertCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.UpdateCommand != null))) { + this.Adapter.UpdateCommand.Transaction = this._transaction; + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { + get { + if ((this._commandCollection == null)) { + this.InitCommandCollection(); + } + return this._commandCollection; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public bool ClearBeforeFill { + get { + return this._clearBeforeFill; + } + set { + this._clearBeforeFill = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + private void InitAdapter() { + this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); + global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); + tableMapping.SourceTable = "Table"; + tableMapping.DataSetTable = "v_selParticolari"; + tableMapping.ColumnMappings.Add("value", "value"); + tableMapping.ColumnMappings.Add("label", "label"); + tableMapping.ColumnMappings.Add("conditio", "conditio"); + this._adapter.TableMappings.Add(tableMapping); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + private void InitConnection() { + this._connection = new global::System.Data.SqlClient.SqlConnection(); + this._connection.ConnectionString = global::GMW_data.Properties.Settings.Default.GMWConnectionString; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + private void InitCommandCollection() { + 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 value, label, conditio FROM dbo.v_selParticolari"; + 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_particolariByConditio"; + 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("@conditio", global::System.Data.SqlDbType.NVarChar, 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_particolariByConditioLikePref"; + 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("@conditio", global::System.Data.SqlDbType.NVarChar, 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("@prefText", 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()] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] + public virtual int Fill(DS_Utility.v_selParticolariDataTable dataTable) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] + public virtual DS_Utility.v_selParticolariDataTable GetData() { + this.Adapter.SelectCommand = this.CommandCollection[0]; + DS_Utility.v_selParticolariDataTable dataTable = new DS_Utility.v_selParticolariDataTable(); + 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_Utility.v_selParticolariDataTable getByConditio(string conditio) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((conditio == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(conditio)); + } + DS_Utility.v_selParticolariDataTable dataTable = new DS_Utility.v_selParticolariDataTable(); + 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_Utility.v_selParticolariDataTable getByConditioPref(string conditio, string prefText) { + this.Adapter.SelectCommand = this.CommandCollection[2]; + if ((conditio == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(conditio)); + } + if ((prefText == null)) { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(prefText)); + } + DS_Utility.v_selParticolariDataTable dataTable = new DS_Utility.v_selParticolariDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + } + /// ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios /// diff --git a/GMW/GMW_data/DS_Utility.xsd b/GMW/GMW_data/DS_Utility.xsd index f57fcad5..93e39dde 100644 --- a/GMW/GMW_data/DS_Utility.xsd +++ b/GMW/GMW_data/DS_Utility.xsd @@ -577,6 +577,48 @@ where value = @value + + + + + + SELECT value, label, conditio FROM dbo.v_selParticolari + + + + + + + + + + + + + + + dbo.stp_particolariByConditio + + + + + + + + + + + dbo.stp_particolariByConditioLikePref + + + + + + + + + + @@ -588,21 +630,21 @@ where value = @value - + - + - + @@ -615,22 +657,22 @@ where value = @value - - + + - + - + @@ -643,35 +685,15 @@ where value = @value - - + + - - - - - - - - - - - - - - - - - - - - - + @@ -685,21 +707,41 @@ where value = @value - + + + + + + + - + + + + + + + + + + + + + + + - + @@ -712,29 +754,29 @@ where value = @value - - + + - + - + - + @@ -747,8 +789,8 @@ where value = @value - - + + @@ -761,14 +803,14 @@ where value = @value - + - + @@ -781,29 +823,29 @@ where value = @value - + - + - + - - + + @@ -816,14 +858,14 @@ where value = @value - + - + @@ -836,21 +878,21 @@ where value = @value - + - + - + @@ -863,21 +905,21 @@ where value = @value - + - + - + @@ -917,22 +959,49 @@ where value = @value - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -984,5 +1053,9 @@ where value = @value + + + + \ No newline at end of file diff --git a/GMW/GMW_data/DS_Utility.xss b/GMW/GMW_data/DS_Utility.xss index bbf4b963..c4ceeacf 100644 --- a/GMW/GMW_data/DS_Utility.xss +++ b/GMW/GMW_data/DS_Utility.xss @@ -4,22 +4,23 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GMW/GMW_data/DS_magazzino.Designer.cs b/GMW/GMW_data/DS_magazzino.Designer.cs index a5cf05e5..6af9d026 100644 --- a/GMW/GMW_data/DS_magazzino.Designer.cs +++ b/GMW/GMW_data/DS_magazzino.Designer.cs @@ -4777,6 +4777,8 @@ namespace GMW_data { private global::System.Data.DataColumn columnNewest; + private global::System.Data.DataColumn columnDescBlocco; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public V_MagazziniOverviewDataTable() { this.TableName = "V_MagazziniOverview"; @@ -4884,6 +4886,13 @@ namespace GMW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.DataColumn DescBloccoColumn { + get { + return this.columnDescBlocco; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Browsable(false)] public int Count { @@ -4913,7 +4922,7 @@ namespace GMW_data { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public V_MagazziniOverviewRow AddV_MagazziniOverviewRow(string CodCS, string CodMag, string DescMag, int IdxBlocco, string CodBlocco, int TotCelle, int CelleAttive, int CelleOccupate, int CelleLibere, System.DateTime Oldest, System.DateTime Newest) { + public V_MagazziniOverviewRow AddV_MagazziniOverviewRow(string CodCS, string CodMag, string DescMag, int IdxBlocco, string CodBlocco, int TotCelle, int CelleAttive, int CelleOccupate, int CelleLibere, System.DateTime Oldest, System.DateTime Newest, string DescBlocco) { V_MagazziniOverviewRow rowV_MagazziniOverviewRow = ((V_MagazziniOverviewRow)(this.NewRow())); object[] columnValuesArray = new object[] { CodCS, @@ -4926,7 +4935,8 @@ namespace GMW_data { CelleOccupate, CelleLibere, Oldest, - Newest}; + Newest, + DescBlocco}; rowV_MagazziniOverviewRow.ItemArray = columnValuesArray; this.Rows.Add(rowV_MagazziniOverviewRow); return rowV_MagazziniOverviewRow; @@ -4965,6 +4975,7 @@ namespace GMW_data { this.columnCelleLibere = base.Columns["CelleLibere"]; this.columnOldest = base.Columns["Oldest"]; this.columnNewest = base.Columns["Newest"]; + this.columnDescBlocco = base.Columns["DescBlocco"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4991,6 +5002,8 @@ namespace GMW_data { base.Columns.Add(this.columnOldest); this.columnNewest = new global::System.Data.DataColumn("Newest", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnNewest); + this.columnDescBlocco = new global::System.Data.DataColumn("DescBlocco", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDescBlocco); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnCodCS, this.columnCodMag, @@ -5001,11 +5014,13 @@ namespace GMW_data { this.columnCodMag.MaxLength = 50; this.columnDescMag.MaxLength = 50; this.columnIdxBlocco.AllowDBNull = false; + this.columnCodBlocco.AllowDBNull = false; this.columnCodBlocco.MaxLength = 3; this.columnTotCelle.ReadOnly = true; this.columnCelleLibere.ReadOnly = true; this.columnOldest.ReadOnly = true; this.columnNewest.ReadOnly = true; + this.columnDescBlocco.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -12193,12 +12208,7 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string CodBlocco { get { - try { - return ((string)(this[this.tableV_MagazziniOverview.CodBloccoColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'CodBlocco\' in table \'V_MagazziniOverview\' is DBNull.", e); - } + return ((string)(this[this.tableV_MagazziniOverview.CodBloccoColumn])); } set { this[this.tableV_MagazziniOverview.CodBloccoColumn] = value; @@ -12295,6 +12305,21 @@ namespace GMW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public string DescBlocco { + get { + try { + return ((string)(this[this.tableV_MagazziniOverview.DescBloccoColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'DescBlocco\' in table \'V_MagazziniOverview\' is DBNull.", e); + } + } + set { + this[this.tableV_MagazziniOverview.DescBloccoColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public bool IsDescMagNull() { return this.IsNull(this.tableV_MagazziniOverview.DescMagColumn); @@ -12305,16 +12330,6 @@ namespace GMW_data { this[this.tableV_MagazziniOverview.DescMagColumn] = global::System.Convert.DBNull; } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public bool IsCodBloccoNull() { - return this.IsNull(this.tableV_MagazziniOverview.CodBloccoColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public void SetCodBloccoNull() { - this[this.tableV_MagazziniOverview.CodBloccoColumn] = global::System.Convert.DBNull; - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public bool IsTotCelleNull() { return this.IsNull(this.tableV_MagazziniOverview.TotCelleColumn); @@ -12374,6 +12389,16 @@ namespace GMW_data { public void SetNewestNull() { this[this.tableV_MagazziniOverview.NewestColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public bool IsDescBloccoNull() { + return this.IsNull(this.tableV_MagazziniOverview.DescBloccoColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public void SetDescBloccoNull() { + this[this.tableV_MagazziniOverview.DescBloccoColumn] = global::System.Convert.DBNull; + } } /// @@ -22051,6 +22076,7 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co tableMapping.ColumnMappings.Add("CelleLibere", "CelleLibere"); tableMapping.ColumnMappings.Add("Oldest", "Oldest"); tableMapping.ColumnMappings.Add("Newest", "Newest"); + tableMapping.ColumnMappings.Add("DescBlocco", "DescBlocco"); this._adapter.TableMappings.Add(tableMapping); } @@ -22065,8 +22091,7 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT CodCS, CodMag, DescMag, IdxBlocco, CodBlocco, TotCelle, CelleAttive, Celle" + - "Occupate, CelleLibere, Oldest, Newest FROM dbo.V_MagazziniOverview"; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM dbo.V_MagazziniOverview"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; @@ -25559,8 +25584,7 @@ SELECT IdxPosizione, DescPosizione, IsRiattivaEnabled FROM AnagPosizioni WHERE ( this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT CodCS, CodMagLogico, DescMagLogico, IdxBlocco, CodMag, CodBlocco, CelleOcc" + - "upate, Oldest, Newest FROM dbo.V_MagazziniLogiciOverview"; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM dbo.V_MagazziniLogiciOverview"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; diff --git a/GMW/GMW_data/DS_magazzino.xsd b/GMW/GMW_data/DS_magazzino.xsd index b5cd71e1..9452739e 100644 --- a/GMW/GMW_data/DS_magazzino.xsd +++ b/GMW/GMW_data/DS_magazzino.xsd @@ -1528,10 +1528,11 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co - + - - SELECT CodCS, CodMag, DescMag, IdxBlocco, CodBlocco, TotCelle, CelleAttive, CelleOccupate, CelleLibere, Oldest, Newest FROM dbo.V_MagazziniOverview + + SELECT * +FROM dbo.V_MagazziniOverview @@ -1549,6 +1550,7 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co + @@ -2381,10 +2383,11 @@ WHERE (IdxPosizione = @IdxPosizione) - + - - SELECT CodCS, CodMagLogico, DescMagLogico, IdxBlocco, CodMag, CodBlocco, CelleOccupate, Oldest, Newest FROM dbo.V_MagazziniLogiciOverview + + SELECT * +FROM dbo.V_MagazziniLogiciOverview @@ -2810,122 +2813,122 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - - - - + + + + - - - - - - + + + + + + @@ -2938,153 +2941,6 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3099,18 +2955,18 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - - - - - - - - + + + + + + + + - + @@ -3120,7 +2976,154 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3134,79 +3137,79 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - + - + - + - + - - - + + + - - + + - - + + - + - + - - - - - - + + + + + + @@ -3219,21 +3222,21 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - + - + - + @@ -3244,6 +3247,350 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3260,358 +3607,21 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -3624,131 +3634,131 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - - + + - + - - + + - - - + + + - + - - + + - - + + - + - - - + + + - - - + + + - + - + - + - - + + - - + + - + - + @@ -3768,8 +3778,8 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - - + + @@ -3782,33 +3792,33 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - - - + + + - + - - + + - - - + + + @@ -3821,42 +3831,42 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - + - + - + - + - + - + @@ -3869,21 +3879,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 90f5c126..7615b698 100644 --- a/GMW/GMW_data/DS_magazzino.xss +++ b/GMW/GMW_data/DS_magazzino.xss @@ -4,33 +4,33 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + @@ -69,7 +69,7 @@ - + 712 @@ -141,7 +141,7 @@ - + 392 @@ -157,7 +157,7 @@ - + 1029 diff --git a/GMW/GMW_data/GMW_data.csproj b/GMW/GMW_data/GMW_data.csproj index ddbe132e..25970e65 100644 --- a/GMW/GMW_data/GMW_data.csproj +++ b/GMW/GMW_data/GMW_data.csproj @@ -271,6 +271,7 @@ + diff --git a/GMW/GMW_data/SqlScripts/V1.2/GMW_00427.sql b/GMW/GMW_data/SqlScripts/V1.2/GMW_00427.sql new file mode 100644 index 00000000..6f9b84aa --- /dev/null +++ b/GMW/GMW_data/SqlScripts/V1.2/GMW_00427.sql @@ -0,0 +1,406 @@ +set xact_abort on; +go + +begin transaction; +go + +set ANSI_NULLS on; +go + +create VIEW v_selParticolari +AS +SELECT Particolare AS value, DescParticolare AS label, ClassifArticolo AS conditio +FROM RilPro.AnagParticolari +go + +commit; +go + + +set xact_abort on; +go + +begin transaction; +go + +set ANSI_NULLS on; +go + +/***************************************** +* STORED stp_particolariByConditio +* +* Recupera elenco particolari data la condizione +* +* Steamware, S.E.L. +* mod: 2012.03.16 +* +****************************************/ +create PROCEDURE stp_particolariByConditio +( + @conditio NVARCHAR(50) +) +AS + +SELECT * +FROM v_selParticolari +WHERE conditio = @conditio + +RETURN +go + +/***************************************** +* STORED stp_particolariByConditioLikePref +* +* Recupera elenco particolari data la condizione e l'inizio del campo value (ricerca like) +* +* Steamware, S.E.L. +* mod: 2012.03.16 +* +****************************************/ +create PROCEDURE stp_particolariByConditioLikePref +( + @conditio NVARCHAR(50), + @prefText NVARCHAR(50) +) +AS + +SELECT * +FROM v_selParticolari +WHERE conditio = @conditio +AND value LIKE @prefText + '%' + +RETURN +go + +commit; +go + + +set xact_abort on; +go + +begin transaction; +go + +set ANSI_NULLS on; +go + +alter VIEW V_MagazziniOverview +AS +SELECT TOP (100) PERCENT dbo.AnagMag.CodCS, dbo.AnagMag.CodMag, dbo.AnagMag.DescMag, dbo.Blocchi.IdxBlocco, dbo.Blocchi.CodBlocco, dbo.Blocchi.DescBlocco, + dbo.TipoCella.Capienza * dbo.Blocchi.NumX * dbo.Blocchi.NumY * dbo.Blocchi.NumZ AS TotCelle, dbo.TipoCella.Capienza * COUNT(DISTINCT dbo.Celle.IdxCella) + AS CelleAttive, COUNT(dbo.PosizioneUdcCorrente.UDC) AS CelleOccupate, dbo.TipoCella.Capienza * COUNT(DISTINCT dbo.Celle.IdxCella) + - COUNT(dbo.PosizioneUdcCorrente.UDC) AS CelleLibere, ISNULL(MIN(dbo.PosizioneUdcCorrente.DataRif), GETDATE()) AS Oldest, + ISNULL(MAX(dbo.PosizioneUdcCorrente.DataRif), GETDATE()) AS Newest +FROM dbo.TipoCella INNER JOIN + dbo.AnagMag INNER JOIN + dbo.Blocchi ON dbo.AnagMag.CodMag = dbo.Blocchi.CodMag AND dbo.AnagMag.CodCS = dbo.Blocchi.CodCS ON dbo.TipoCella.CodMag = dbo.AnagMag.CodMag AND + dbo.TipoCella.CodCS = dbo.AnagMag.CodCS LEFT OUTER JOIN + dbo.Celle ON dbo.TipoCella.IdxTipoCella = dbo.Celle.IdxTipoCella AND dbo.Blocchi.IdxBlocco = dbo.Celle.IdxBlocco LEFT OUTER JOIN + dbo.PosizioneUdcCorrente ON dbo.Celle.IdxCella = dbo.PosizioneUdcCorrente.IdxCella +WHERE (dbo.Celle.Attiva = 1) +GROUP BY dbo.AnagMag.CodCS, dbo.AnagMag.CodMag, dbo.AnagMag.DescMag, dbo.Blocchi.IdxBlocco, dbo.Blocchi.CodBlocco, dbo.Blocchi.NumX, dbo.Blocchi.NumY, + dbo.Blocchi.NumZ, dbo.TipoCella.Capienza, dbo.Blocchi.DescBlocco +ORDER BY dbo.AnagMag.CodMag, dbo.Blocchi.CodBlocco +go + +exec sp_updateextendedproperty 'MS_DiagramPane1', '[0E232FF0-B466-11cf-A24F-00AA00A3EFFF, 1.00] +Begin DesignProperties = + Begin PaneConfigurations = + Begin PaneConfiguration = 0 + NumPanes = 4 + Configuration = "(H (1[39] 4[23] 2[11] 3) )" + End + Begin PaneConfiguration = 1 + NumPanes = 3 + Configuration = "(H (1 [50] 4 [25] 3))" + End + Begin PaneConfiguration = 2 + NumPanes = 3 + Configuration = "(H (1 [50] 2 [25] 3))" + End + Begin PaneConfiguration = 3 + NumPanes = 3 + Configuration = "(H (4 [30] 2 [40] 3))" + End + Begin PaneConfiguration = 4 + NumPanes = 2 + Configuration = "(H (1 [56] 3))" + End + Begin PaneConfiguration = 5 + NumPanes = 2 + Configuration = "(H (2 [66] 3))" + End + Begin PaneConfiguration = 6 + NumPanes = 2 + Configuration = "(H (4 [50] 3))" + End + Begin PaneConfiguration = 7 + NumPanes = 1 + Configuration = "(V (3))" + End + Begin PaneConfiguration = 8 + NumPanes = 3 + Configuration = "(H (1[56] 4[18] 2) )" + End + Begin PaneConfiguration = 9 + NumPanes = 2 + Configuration = "(H (1 [75] 4))" + End + Begin PaneConfiguration = 10 + NumPanes = 2 + Configuration = "(H (1[66] 2) )" + End + Begin PaneConfiguration = 11 + NumPanes = 2 + Configuration = "(H (4 [60] 2))" + End + Begin PaneConfiguration = 12 + NumPanes = 1 + Configuration = "(H (1) )" + End + Begin PaneConfiguration = 13 + NumPanes = 1 + Configuration = "(V (4))" + End + Begin PaneConfiguration = 14 + NumPanes = 1 + Configuration = "(V (2))" + End + ActivePaneConfig = 0 + End + Begin DiagramPane = + Begin Origin = + Top = 0 + Left = 0 + End + Begin Tables = + Begin Table = "TipoCella" + Begin Extent = + Top = 6 + Left = 38 + Bottom = 135 + Right = 224 + End + DisplayFlags = 280 + TopColumn = 0 + End + Begin Table = "AnagMag" + Begin Extent = + Top = 6 + Left = 662 + Bottom = 118 + Right = 832 + End + DisplayFlags = 280 + TopColumn = 0 + End + Begin Table = "Blocchi" + Begin Extent = + Top = 36 + Left = 974 + Bottom = 257 + Right = 1144 + End + DisplayFlags = 280 + TopColumn = 0 + End + Begin Table = "Celle" + Begin Extent = + Top = 149 + Left = 629 + Bottom = 313 + Right = 799 + End + DisplayFlags = 280 + TopColumn = 0 + End + Begin Table = "PosizioneUdcCorrente" + Begin Extent = + Top = 159 + Left = 201 + Bottom = 288 + Right = 371 + End + DisplayFlags = 280 + TopColumn = 0 + End + End + End + Begin SQLPane = + End + Begin DataPane = + Begin ParameterDefaults = "" + End + Begin ColumnWidths = 13 + Width = 284 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1665 + Width = 1665 + Width = 1500 + Width = 1500 + End + End + B', 'SCHEMA', 'dbo', 'VIEW', 'V_MagazziniOverview'; +go + +exec sp_updateextendedproperty 'MS_DiagramPane2', 'egin CriteriaPane = + Begin ColumnWidths = 12 + Column = 1440 + Alias = 900 + Table = 1170 + Output = 720 + Append = 1400 + NewValue = 1170 + SortType = 1350 + SortOrder = 1410 + GroupBy = 1350 + Filter = 1350 + Or = 1350 + Or = 1350 + Or = 1350 + End + End +End +', 'SCHEMA', 'dbo', 'VIEW', 'V_MagazziniOverview'; +go + +commit; +go + + +set xact_abort on; +go + +begin transaction; +go + +set ANSI_NULLS on; +go + +/*************************************** +* STORED stp_ParticolariOverview +* +* elenco di overview sullo stato dei magazzini (dettaglio a "maglie larghe") +* +* Steamware, S.E.L. +* mod: 2010.06.02 +* +****************************************/ +alter PROCEDURE stp_magazzinoOverview +( + @CodCS VARCHAR(2) +) +AS + + SELECT AnagMag.CodCS, AnagMag.CodMag, AnagMag.DescMag, Blocchi.IdxBlocco, Blocchi.CodBlocco, Blocchi.DescBlocco, + TipoCella.Capienza * Blocchi.NumX * Blocchi.NumY * Blocchi.NumZ AS TotCelle, + TipoCella.Capienza * COUNT(DISTINCT Celle.IdxCella) AS CelleAttive, + COUNT(PosizioneUdcCorrente.UDC) AS CelleOccupate, + TipoCella.Capienza * COUNT(DISTINCT Celle.IdxCella) - COUNT(PosizioneUdcCorrente.UDC) AS CelleLibere, + ISNULL(MIN(PosizioneUdcCorrente.DataRif), GETDATE()) AS Oldest, ISNULL(MAX(PosizioneUdcCorrente.DataRif), GETDATE()) AS Newest +FROM TipoCella INNER JOIN + AnagMag INNER JOIN + Blocchi ON AnagMag.CodMag = Blocchi.CodMag AND AnagMag.CodCS = Blocchi.CodCS ON TipoCella.CodMag = AnagMag.CodMag AND + TipoCella.CodCS = AnagMag.CodCS LEFT OUTER JOIN + Celle ON TipoCella.IdxTipoCella = Celle.IdxTipoCella AND Blocchi.IdxBlocco = Celle.IdxBlocco LEFT OUTER JOIN + PosizioneUdcCorrente ON Celle.IdxCella = PosizioneUdcCorrente.IdxCella +WHERE (Celle.Attiva = 1) AND (AnagMag.CodCS = @CodCS) AND (ISNULL(AnagMag.Nascosto, 0) = 0) +GROUP BY AnagMag.CodCS, AnagMag.CodMag, AnagMag.DescMag, Blocchi.IdxBlocco, Blocchi.CodBlocco, Blocchi.DescBlocco, + Blocchi.NumX, Blocchi.NumY, Blocchi.NumZ, + TipoCella.Capienza +ORDER BY AnagMag.CodMag, Blocchi.CodBlocco + +RETURN +go + +/*************************************** +* STORED stp_ParticolariOverview +* +* restituisce solo la riga con il num max di celle DI UN DATO magazzino +* +* Steamware, S.E.L. +* mod: 2010.06.02 +* +****************************************/ +alter PROCEDURE stp_magazzinoOverviewByMag_maxCelle +( + @CodCS VARCHAR(2), + @CodMag VARCHAR(50) +) +AS + + +WITH cte_celle AS( + SELECT b.CodBlocco, c.IdxTipoCella, COUNT(c.IdxCella) * t.Capienza AS numCelle + FROM Celle AS c INNER JOIN + Blocchi AS b ON c.IdxBlocco = b.IdxBlocco INNER JOIN + TipoCella AS t ON c.IdxTipoCella = t.IdxTipoCella + WHERE (b.CodCS = @CodCS) AND (b.CodMag = @CodMag) + GROUP BY b.CodBlocco, c.IdxTipoCella, t.Capienza +) + + + SELECT TOP (1) AnagMag.CodCS, AnagMag.CodMag, AnagMag.DescMag, b.IdxBlocco, b.CodBlocco, b.DescBlocco, + ISNULL(c.numCelle,ISNULL(b.NumX * b.NumY * b.NumZ,1)) AS TotCelle, + 0 AS CelleAttive, 0 AS CelleOccupate, 0 AS CelleLibere, GETDATE() AS Oldest, GETDATE() AS Newest + FROM AnagMag INNER JOIN Blocchi b ON AnagMag.CodMag = b.CodMag AND AnagMag.CodCS = b.CodCS INNER JOIN cte_celle c ON c.CodBlocco = b.CodBlocco + WHERE (AnagMag.CodCS = @CodCS) AND AnagMag.CodMag = @CodMag + ORDER BY TotCelle DESC +RETURN +go + +/*************************************** +* STORED stp_ParticolariOverview +* +* restituisce solo la riga con il num max di celle +* +* Steamware, S.E.L. +* mod: 2010.06.02 +* +****************************************/ +alter PROCEDURE stp_magazzinoOverview_maxCelle +( + @CodCS VARCHAR(2) +) +AS + +WITH cte_celle AS( + SELECT b.CodBlocco, c.IdxTipoCella, COUNT(c.IdxCella) * t.Capienza AS numCelle + FROM Celle AS c INNER JOIN + Blocchi AS b ON c.IdxBlocco = b.IdxBlocco INNER JOIN + TipoCella AS t ON c.IdxTipoCella = t.IdxTipoCella + WHERE (b.CodCS = @CodCS) + GROUP BY b.CodBlocco, c.IdxTipoCella, t.Capienza +) + + + SELECT TOP (1) AnagMag.CodCS, AnagMag.CodMag, AnagMag.DescMag, b.IdxBlocco, b.CodBlocco, b.DescBlocco, + ISNULL(c.numCelle,ISNULL(b.NumX * b.NumY * b.NumZ,1)) AS TotCelle, + 0 AS CelleAttive, 0 AS CelleOccupate, 0 AS CelleLibere, GETDATE() AS Oldest, GETDATE() AS Newest + FROM AnagMag INNER JOIN Blocchi b ON AnagMag.CodMag = b.CodMag AND AnagMag.CodCS = b.CodCS INNER JOIN cte_celle c ON c.CodBlocco = b.CodBlocco + WHERE (AnagMag.CodCS = @CodCS) + ORDER BY TotCelle DESC + +RETURN +go + +commit; +go + + + + + + + +-- registro versione... +INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(427, GETDATE()) +GO diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 065e5f94..23580f20 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 71c329f2..c2f664ca 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 927a5d72..a00fd41f 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 065e5f94..23580f20 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/Refactor/GMW_data.dll b/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll index a7ccf906..411620a0 100644 Binary files a/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll and b/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_data/obj/Debug/ResolveAssemblyReference.cache index e74d84b6..6b40070f 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 a717cef2..1b2f8736 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 59bfee99..81e841bb 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 927a5d72..a00fd41f 100644 Binary files a/GMW/GMW_data/obj/Release/GMW_data.dll and b/GMW/GMW_data/obj/Release/GMW_data.dll differ diff --git a/GMW/GMW_data/utils.cs b/GMW/GMW_data/utils.cs index 4f18d3f5..765046bd 100644 --- a/GMW/GMW_data/utils.cs +++ b/GMW/GMW_data/utils.cs @@ -16,6 +16,7 @@ namespace GMW_data public DS_UtilityTableAdapters.v_selUdcByPartTableAdapter taUdcByPart; public DS_UtilityTableAdapters.v_selDestinatariListePrelievoTableAdapter taDestListePre; public DS_UtilityTableAdapters.AS400_ComandiTableAdapter taAs400; + public DS_UtilityTableAdapters.v_selParticolariTableAdapter taSelPart; /// @@ -28,6 +29,7 @@ namespace GMW_data taUdcByPart = new GMW_data.DS_UtilityTableAdapters.v_selUdcByPartTableAdapter(); taDestListePre = new GMW_data.DS_UtilityTableAdapters.v_selDestinatariListePrelievoTableAdapter(); taAs400 = new GMW_data.DS_UtilityTableAdapters.AS400_ComandiTableAdapter(); + taSelPart = new GMW_data.DS_UtilityTableAdapters.v_selParticolariTableAdapter(); } /// /// effettua setup dei connection strings da web.config delal singola applicazione @@ -41,6 +43,7 @@ namespace GMW_data taUdcByPart.Connection.ConnectionString = connString; taDestListePre.Connection.ConnectionString = connString; taAs400.Connection.ConnectionString = connString; + taSelPart.Connection.ConnectionString = connString; } #endregion diff --git a/GMW/GMW_deploy/Source/WS/AutoCompletamento.asmx.cs b/GMW/GMW_deploy/Source/WS/AutoCompletamento.asmx.cs index 03980fa6..7243aa67 100644 --- a/GMW/GMW_deploy/Source/WS/AutoCompletamento.asmx.cs +++ b/GMW/GMW_deploy/Source/WS/AutoCompletamento.asmx.cs @@ -19,6 +19,24 @@ namespace GMW.WS public class AutoCompletamento : System.Web.Services.WebService { + [System.Web.Services.WebMethod] + public string[] elencoAnime(string prefixText, int count) + { + // inizializzo risposta + List suggerimenti = new List(); + // proseguo SOLO SE min "MinCharAutocomplete" char... + if (count >= memLayer.ML.confReadInt("MinCharAutocomplete")) + { + // elenco candidati + DS_Utility.v_selParticolariDataTable tabParticolari = utils.obj.taSelPart.getByConditioPref("A", prefixText); + // aggiungo ogni riga... + foreach (DS_Utility.v_selParticolariRow riga in tabParticolari) + { + suggerimenti.Add(riga.value); + } + } + return suggerimenti.ToArray(); + } [System.Web.Services.WebMethod] public string[] elencoParticolari(string prefixText, int count) { @@ -28,11 +46,11 @@ namespace GMW.WS if (count >= memLayer.ML.confReadInt("MinCharAutocomplete")) { // elenco candidati - DS_magazzino.V_ParticolariOverviewDataTable tabParticolari = MagClass.magazzino.taVParticolariOverwiew.getByLikePrefix(prefixText, memLayer.ML.confReadString("CodCS")); + DS_Utility.v_selParticolariDataTable tabParticolari = utils.obj.taSelPart.getByConditioPref("P", prefixText); // aggiungo ogni riga... - foreach (DS_magazzino.V_ParticolariOverviewRow riga in tabParticolari) + foreach (DS_Utility.v_selParticolariRow riga in tabParticolari) { - suggerimenti.Add(riga.Particolare); + suggerimenti.Add(riga.value); } } return suggerimenti.ToArray(); @@ -55,6 +73,6 @@ namespace GMW.WS } return suggerimenti.ToArray(); } - + } } diff --git a/GMW/GMW_installer/GMW_installer.vdproj b/GMW/GMW_installer/GMW_installer.vdproj index 64656e24..2ea1f280 100644 --- a/GMW/GMW_installer/GMW_installer.vdproj +++ b/GMW/GMW_installer/GMW_installer.vdproj @@ -307,7 +307,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW" "ProductCode" = "8:{FC1F8B43-87CB-46E0-A0F8-E8340418AE0F}" - "PackageCode" = "8:{ADC688D8-DF87-421A-B41B-0407AC137271}" + "PackageCode" = "8:{23E05040-E8BA-47DF-A8D4-0567E2009850}" "UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" @@ -786,7 +786,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4FD0E5B75A7F47B79080EC0983BE6583" { - "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe" + "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_5606017201AE45B480A8ABD8B8D68264" @@ -814,7 +814,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8BDD7AA9D46A46EC80880F83F13C902E" { - "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe" + "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_5606017201AE45B480A8ABD8B8D68264" diff --git a/GMW/GMW_installer/Release/GMW_installer.msi b/GMW/GMW_installer/Release/GMW_installer.msi index 62fd18c6..1aeea4a2 100644 Binary files a/GMW/GMW_installer/Release/GMW_installer.msi and b/GMW/GMW_installer/Release/GMW_installer.msi differ diff --git a/GMW/GMW_test_installer/GMW_test_installer.vdproj b/GMW/GMW_test_installer/GMW_test_installer.vdproj index f1516875..ac09fe86 100644 --- a/GMW/GMW_test_installer/GMW_test_installer.vdproj +++ b/GMW/GMW_test_installer/GMW_test_installer.vdproj @@ -301,14 +301,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW_test" - "ProductCode" = "8:{B2CB0FAC-4475-48F8-8881-A0B82EF5456C}" - "PackageCode" = "8:{1D1C061C-BA9B-4E2C-A74A-3B3CBE0C783A}" + "ProductCode" = "8:{57FE96F9-ABD2-44EE-80E3-F3A11A0F183B}" + "PackageCode" = "8:{5FF48EA0-229F-47D6-8A66-4BEA9796518A}" "UpgradeCode" = "8:{6FD64E39-D93B-4ADA-ADF3-303A1BCA49C2}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.1.426" + "ProductVersion" = "8:1.1.427" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" @@ -753,7 +753,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_110D6612090D4EDA92F772F593B23D78" { - "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe" + "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_D4983B53F0234BFF98835BF3AFECBB8D" @@ -781,7 +781,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_179F2C709A0749C4A5EBA956FADE7EE3" { - "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe" + "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_D4983B53F0234BFF98835BF3AFECBB8D" diff --git a/GMW/GMW_test_installer/Release/GMW_test_installer.msi b/GMW/GMW_test_installer/Release/GMW_test_installer.msi index 91444765..5577c908 100644 Binary files a/GMW/GMW_test_installer/Release/GMW_test_installer.msi and b/GMW/GMW_test_installer/Release/GMW_test_installer.msi differ