diff --git a/GMW/GMW/WebUserControls/mod_chLang.ascx b/GMW/GMW/WebUserControls/mod_chLang.ascx index 5e0d543d..208a3e4b 100644 --- a/GMW/GMW/WebUserControls/mod_chLang.ascx +++ b/GMW/GMW/WebUserControls/mod_chLang.ascx @@ -3,7 +3,7 @@ diff --git a/GMW/GMW/WebUserControls/mod_execCelle.ascx b/GMW/GMW/WebUserControls/mod_execCelle.ascx index 0264bec1..4c9bc8e4 100644 --- a/GMW/GMW/WebUserControls/mod_execCelle.ascx +++ b/GMW/GMW/WebUserControls/mod_execCelle.ascx @@ -1,5 +1,5 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_execCelle.ascx.cs" Inherits="GMW.WebUserControls.mod_execCelle" %> - +
- +
diff --git a/GMW/GMW/WebUserControls/mod_execCelle.ascx.cs b/GMW/GMW/WebUserControls/mod_execCelle.ascx.cs index 5eb43a65..e2c7022f 100644 --- a/GMW/GMW/WebUserControls/mod_execCelle.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_execCelle.ascx.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using SteamWare; namespace GMW.WebUserControls { @@ -11,7 +12,17 @@ namespace GMW.WebUserControls { protected void Page_Load(object sender, EventArgs e) { - + lblTitolo.Text = traduci("OpCelle"); } + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(object lemma) + { + return user_std.UtSn.Traduci(lemma.ToString()); + } + } } \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_execCelle.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_execCelle.ascx.designer.cs index 98a4a28d..f1a80bdd 100644 --- a/GMW/GMW/WebUserControls/mod_execCelle.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_execCelle.ascx.designer.cs @@ -13,6 +13,15 @@ namespace GMW.WebUserControls { public partial class mod_execCelle { + /// + /// lblTitolo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblTitolo; + /// /// Button1 control. /// diff --git a/GMW/GMW/WebUserControls/mod_execImballi.ascx b/GMW/GMW/WebUserControls/mod_execImballi.ascx index aa9488e0..930ecd92 100644 --- a/GMW/GMW/WebUserControls/mod_execImballi.ascx +++ b/GMW/GMW/WebUserControls/mod_execImballi.ascx @@ -1,5 +1,5 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_execImballi.ascx.cs" Inherits="GMW.WebUserControls.mod_execImballi" %> - +
diff --git a/GMW/GMW/WebUserControls/mod_execImballi.ascx.cs b/GMW/GMW/WebUserControls/mod_execImballi.ascx.cs index 9d9678e6..6b18a536 100644 --- a/GMW/GMW/WebUserControls/mod_execImballi.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_execImballi.ascx.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using SteamWare; namespace GMW.WebUserControls { @@ -11,7 +12,16 @@ namespace GMW.WebUserControls { protected void Page_Load(object sender, EventArgs e) { - + lblTitolo.Text = traduci("OpImballi"); } + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(object lemma) + { + return user_std.UtSn.Traduci(lemma.ToString()); + } } } \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_execImballi.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_execImballi.ascx.designer.cs index a75d98ad..d15b2c60 100644 --- a/GMW/GMW/WebUserControls/mod_execImballi.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_execImballi.ascx.designer.cs @@ -14,13 +14,13 @@ namespace GMW.WebUserControls { public partial class mod_execImballi { /// - /// Label1 control. + /// lblTitolo control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Label Label1; + protected global::System.Web.UI.WebControls.Label lblTitolo; /// /// Button1 control. diff --git a/GMW/GMW/WebUserControls/mod_execOperatori.ascx b/GMW/GMW/WebUserControls/mod_execOperatori.ascx index 16a1002d..8f8516e3 100644 --- a/GMW/GMW/WebUserControls/mod_execOperatori.ascx +++ b/GMW/GMW/WebUserControls/mod_execOperatori.ascx @@ -1,5 +1,5 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_execOperatori.ascx.cs" Inherits="GMW.WebUserControls.mod_execOperatori" %> - +
diff --git a/GMW/GMW/WebUserControls/mod_execOperatori.ascx.cs b/GMW/GMW/WebUserControls/mod_execOperatori.ascx.cs index 47872c1e..8242d5bd 100644 --- a/GMW/GMW/WebUserControls/mod_execOperatori.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_execOperatori.ascx.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using SteamWare; namespace GMW.WebUserControls { @@ -11,7 +12,16 @@ namespace GMW.WebUserControls { protected void Page_Load(object sender, EventArgs e) { - + lblTitolo.Text = traduci("OpOperatori"); } + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(object lemma) + { + return user_std.UtSn.Traduci(lemma.ToString()); + } } } \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_execOperatori.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_execOperatori.ascx.designer.cs index 38c3890d..1324e082 100644 --- a/GMW/GMW/WebUserControls/mod_execOperatori.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_execOperatori.ascx.designer.cs @@ -14,13 +14,13 @@ namespace GMW.WebUserControls { public partial class mod_execOperatori { /// - /// Label1 control. + /// lblTitolo control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Label Label1; + protected global::System.Web.UI.WebControls.Label lblTitolo; /// /// Button1 control. diff --git a/GMW/GMW/WebUserControls/mod_lemmiVocab.ascx b/GMW/GMW/WebUserControls/mod_lemmiVocab.ascx index cf252085..af75d0d9 100644 --- a/GMW/GMW/WebUserControls/mod_lemmiVocab.ascx +++ b/GMW/GMW/WebUserControls/mod_lemmiVocab.ascx @@ -15,18 +15,18 @@ - + - + - + - + @@ -35,12 +35,12 @@ TextMode="MultiLine"> - + - + diff --git a/GMW/GMW/WebUserControls/mod_login.ascx b/GMW/GMW/WebUserControls/mod_login.ascx index b8b4c0fd..40f00a51 100644 --- a/GMW/GMW/WebUserControls/mod_login.ascx +++ b/GMW/GMW/WebUserControls/mod_login.ascx @@ -3,14 +3,14 @@
- +
- + @@ -18,7 +18,7 @@
- + @@ -26,7 +26,7 @@
- + @@ -43,7 +43,7 @@ diff --git a/GMW/GMW/WebUserControls/mod_menuBottom.ascx b/GMW/GMW/WebUserControls/mod_menuBottom.ascx index b703d0a0..06c8748f 100644 --- a/GMW/GMW/WebUserControls/mod_menuBottom.ascx +++ b/GMW/GMW/WebUserControls/mod_menuBottom.ascx @@ -1,4 +1,4 @@ <%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_menuBottom" Codebehind="mod_menuBottom.ascx.cs" %> - - - + - + diff --git a/GMW/GMW/WebUserControls/mod_menuBottomPortable.ascx b/GMW/GMW/WebUserControls/mod_menuBottomPortable.ascx index 65b79519..011dab07 100644 --- a/GMW/GMW/WebUserControls/mod_menuBottomPortable.ascx +++ b/GMW/GMW/WebUserControls/mod_menuBottomPortable.ascx @@ -1,4 +1,4 @@ <%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_menuBottomMini" Codebehind="mod_menuBottomPortable.ascx.cs" %> -
- +
+ diff --git a/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx b/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx index ee27484c..b5c63502 100644 --- a/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx +++ b/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx @@ -4,28 +4,29 @@
- +
- + - + - + - + - + - +
+ DataValueField="value" AutoPostBack="True" + onselectedindexchanged="ddlTipoLista_SelectedIndexChanged"> @@ -38,7 +39,8 @@ + DataValueField="Esponente" AutoPostBack="True" + onselectedindexchanged="ddlEsponente_SelectedIndexChanged"> @@ -50,7 +52,8 @@ + DataValueField="Figura" AutoPostBack="True" + onselectedindexchanged="ddlFigura_SelectedIndexChanged"> @@ -65,7 +68,8 @@ + DataValueField="CodImballo" AutoPostBack="True" + onselectedindexchanged="ddlImballo_SelectedIndexChanged"> @@ -78,12 +82,17 @@
- Destinatario - - <%----%> - - +
+ Destinatario + + <%----%> + +
+
+ + +
diff --git a/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.cs b/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.cs index 78de4d2d..4a876a55 100644 --- a/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.cs @@ -55,9 +55,29 @@ namespace GMW.WebUserControls { checkParticolare(); } - + /// + /// controlla il particolare se sia valido + /// private void checkParticolare() { + // calcolo ed aggiorno conteggio pezzi disponibili... + int numPezziDisp = 0; + try + { + string codEsponente = ddlEsponente.SelectedValue; + if (codEsponente == "") codEsponente = "*"; + string codFigura = ddlFigura.SelectedValue; + if (codFigura == "") codFigura = "*"; + string codImballo = ddlImballo.SelectedValue; + if (codImballo == "") codImballo = "*"; + string codTipoLista = ddlTipoLista.SelectedValue; + numPezziDisp = MagClass.magazzino.numUdcDaPart(memLayer.ML.confReadString("CodCS"), txtParticolare.Text.Trim(), codEsponente, codFigura, codImballo, codTipoLista); + lblTotPz.Text = string.Format("{0} UDC ", numPezziDisp); + } + catch (Exception e) + { + logger.lg.scriviLog(string.Format("Eccezione in verifica pezzi disponibili per il particolare {0}: eccezione {1}", txtParticolare.Text.Trim(), e), tipoLog.EXCEPTION); + } // controllo se cod particoalre è valido... if (particolareOk(txtParticolare.Text.Trim())) { @@ -66,7 +86,15 @@ namespace GMW.WebUserControls ddlFigura.Visible = true; txtQta.Visible = true; ddlImballo.Visible = true; - btnCreaNuova.Visible = true; + // verifico + if (numPezziDisp > 0) + { + btnCreaNuova.Visible = true; + } + else + { + btnCreaNuova.Visible = false; + } } else { @@ -100,7 +128,7 @@ namespace GMW.WebUserControls } catch { } - if (qta > 0 && destinatario!="") + if (qta > 0 && destinatario != "") { MagClass.magazzino.creaListaPrelievo(memLayer.ML.confReadString("CodCS"), ddlTipoLista.SelectedValue, txtParticolare.Text.Trim(), ddlEsponente.SelectedValue, ddlFigura.SelectedValue, qta, ddlImballo.SelectedValue, destinatario); // sollevo evento nuovo valore... @@ -130,5 +158,25 @@ namespace GMW.WebUserControls } } + protected void ddlTipoLista_SelectedIndexChanged(object sender, EventArgs e) + { + checkParticolare(); + } + + protected void ddlEsponente_SelectedIndexChanged(object sender, EventArgs e) + { + checkParticolare(); + } + + protected void ddlFigura_SelectedIndexChanged(object sender, EventArgs e) + { + checkParticolare(); + } + + protected void ddlImballo_SelectedIndexChanged(object sender, EventArgs e) + { + checkParticolare(); + } + } } \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.designer.cs index e87dc516..69a20a6e 100644 --- a/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.designer.cs @@ -184,6 +184,15 @@ namespace GMW.WebUserControls { /// protected global::AjaxControlToolkit.AutoCompleteExtender aceDestinatario; + /// + /// lblTotPz control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblTotPz; + /// /// btnCreaNuova control. /// diff --git a/GMW/GMW/WebUserControls/mod_pageTitleAndSearch.ascx b/GMW/GMW/WebUserControls/mod_pageTitleAndSearch.ascx index a227c2cd..7d963fc3 100644 --- a/GMW/GMW/WebUserControls/mod_pageTitleAndSearch.ascx +++ b/GMW/GMW/WebUserControls/mod_pageTitleAndSearch.ascx @@ -4,7 +4,7 @@
- +   diff --git a/GMW/GMW/WebUserControls/mod_periodoAnalisi.ascx b/GMW/GMW/WebUserControls/mod_periodoAnalisi.ascx index 8e298ffa..c1b91bf9 100644 --- a/GMW/GMW/WebUserControls/mod_periodoAnalisi.ascx +++ b/GMW/GMW/WebUserControls/mod_periodoAnalisi.ascx @@ -3,7 +3,7 @@ <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
- +
- +     @@ -62,7 +62,7 @@ -    +    diff --git a/GMW/GMW/WebUserControls/mod_tipoCella.ascx b/GMW/GMW/WebUserControls/mod_tipoCella.ascx index 44b671a1..f4829724 100644 --- a/GMW/GMW/WebUserControls/mod_tipoCella.ascx +++ b/GMW/GMW/WebUserControls/mod_tipoCella.ascx @@ -48,13 +48,13 @@ - + - + - + diff --git a/GMW/GMW/WebUserControls/mod_unauthorized.ascx b/GMW/GMW/WebUserControls/mod_unauthorized.ascx index a32b2a81..ea4c1343 100644 --- a/GMW/GMW/WebUserControls/mod_unauthorized.ascx +++ b/GMW/GMW/WebUserControls/mod_unauthorized.ascx @@ -2,7 +2,7 @@ diff --git a/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx b/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx index 9f6e1280..b9d9f363 100644 --- a/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx +++ b/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx @@ -42,7 +42,7 @@ valore='<%# Bind("UDC") %>' /> - + diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index ca3542a9..2bc72636 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 5b47395c..e9e13d7b 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 019ae7dc..ad3d2baf 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 f2b0952a..249c567a 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 ca3542a9..2bc72636 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 88ae29fc..92f8786f 100644 Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs index dd6a29a6..bac525b4 100644 --- a/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs @@ -186,7 +186,7 @@ namespace GMW_Term.WebUserControls { // salvo in session UDC selezionato memLayer.ML.setSessionVal("UDC_sel", valoreScan, false); - memLayer.ML.setSessionVal("activeTask", string.Format("UDC: {0}", memLayer.ML.StringSessionObj("scannedValue"))); + memLayer.ML.setSessionVal("activeTask", string.Format("UDC: {0}", valoreScan)); if (eh_scannedUdc != null) { eh_scannedUdc(this, new EventArgs()); @@ -207,9 +207,11 @@ namespace GMW_Term.WebUserControls bool barcodeOk = MagClass.magazzino.checkCella(valoreScan); if (barcodeOk) { - // salvo in session UDC selezionato - memLayer.ML.setSessionVal("IdxCella_sel", txtScansione); - memLayer.ML.setSessionVal("activeTask", string.Format("Cella: {0}", memLayer.ML.StringSessionObj("scannedValue"))); + // calcolo idxCella + int idxCella = MagClass.magazzino.IdxCellaByCodCella(memLayer.ML.StringSessionObj("CodCS"), valoreScan); + // salvo in session idxCella selezionata + memLayer.ML.setSessionVal("IdxCella_sel", idxCella); + memLayer.ML.setSessionVal("activeTask", string.Format("Cella: {0}", valoreScan)); if (eh_scannedCella != null) { eh_scannedCella(this, new EventArgs()); @@ -230,9 +232,9 @@ namespace GMW_Term.WebUserControls bool barcodeOk = MagClass.magazzino.checkParticolare(memLayer.ML.StringSessionObj("CodCS"), valoreScan); if (barcodeOk) { - // salvo in session UDC selezionato + // salvo in session particolare selezionato memLayer.ML.setSessionVal("Particolare_sel", txtScansione); - memLayer.ML.setSessionVal("activeTask", string.Format("Particolare: {0}", memLayer.ML.StringSessionObj("scannedValue"))); + memLayer.ML.setSessionVal("activeTask", string.Format("Particolare: {0}", valoreScan)); if (eh_scannedParticolare != null) { eh_scannedParticolare(this, new EventArgs()); diff --git a/GMW/GMW_Term/WebUserControls/mod_execCella.ascx b/GMW/GMW_Term/WebUserControls/mod_execCella.ascx index 6b999b95..cf5aaef7 100644 --- a/GMW/GMW_Term/WebUserControls/mod_execCella.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_execCella.ascx @@ -2,6 +2,8 @@ Inherits="GMW_Term.WebUserControls.mod_execCella" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+
+
diff --git a/GMW/GMW_Term/WebUserControls/mod_execCella.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_execCella.ascx.designer.cs index 4c887273..82d678a8 100644 --- a/GMW/GMW_Term/WebUserControls/mod_execCella.ascx.designer.cs +++ b/GMW/GMW_Term/WebUserControls/mod_execCella.ascx.designer.cs @@ -13,6 +13,15 @@ namespace GMW_Term.WebUserControls { public partial class mod_execCella { + /// + /// lblTitle control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblTitle; + /// /// btnLoginPage control. /// diff --git a/GMW/GMW_Term/WebUserControls/mod_execParticolare.ascx b/GMW/GMW_Term/WebUserControls/mod_execParticolare.ascx index 26130c62..7857364e 100644 --- a/GMW/GMW_Term/WebUserControls/mod_execParticolare.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_execParticolare.ascx @@ -2,6 +2,8 @@ Inherits="GMW_Term.WebUserControls.mod_execParticolare" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+
+
@@ -48,8 +50,10 @@
- UDC: - - pz. + UDC: + - + + pz.
diff --git a/GMW/GMW_Term/WebUserControls/mod_execParticolare.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_execParticolare.ascx.designer.cs index 472948da..750c4cda 100644 --- a/GMW/GMW_Term/WebUserControls/mod_execParticolare.ascx.designer.cs +++ b/GMW/GMW_Term/WebUserControls/mod_execParticolare.ascx.designer.cs @@ -13,6 +13,15 @@ namespace GMW_Term.WebUserControls { public partial class mod_execParticolare { + /// + /// lblTitle control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblTitle; + /// /// btnLoginPage control. /// diff --git a/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx b/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx index 5a7367bb..b4e70ae3 100644 --- a/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx @@ -5,35 +5,35 @@ OnModeChanged="frmView_ModeChanged">
- + UDC:
- + Particolare:
- + DisegnoGrezzo:
- + Esponente:
- + Qta:
- + CodMag: - + CodBlocco:
- + CodCella:
- X: + X: - Y: + Y: - Z: + Z:

@@ -45,34 +45,34 @@
- + UDC:
- + Particolare:
- + DisegnoGrezzo:
- + Esponente:
- + Qta:
- + CodMag: - + CodBlocco:
- + CodCella:
- X: + X: - Y: + Y: - Z: + Z:
diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index 823955ba..673b3294 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/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index 823955ba..673b3294 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_data/DS_magazzino.Designer.cs b/GMW/GMW_data/DS_magazzino.Designer.cs index 50f8f2d4..12a183b9 100644 --- a/GMW/GMW_data/DS_magazzino.Designer.cs +++ b/GMW/GMW_data/DS_magazzino.Designer.cs @@ -12143,7 +12143,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[6]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[7]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, DisegnoGrezzo, Esponente, CodImpianto, DescImpianto, CodStampo, Figura, DataFus, TurnoFus, CodImballo, CodSoggetto, NumCont, Tara, Qta, CodStato, IdxPosizione, PesoTot, PesoCad, CreateDate, ModDate FROM dbo.ElencoCartellini"; @@ -12178,14 +12178,24 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.VarChar, 12, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[5].Connection = this.Connection; - this._commandCollection[5].CommandText = "dbo.stp_UDC_updateQty"; + this._commandCollection[5].CommandText = "dbo.stp_UDC_updateIdxPosizione"; this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.VarChar, 16, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodTipoDichiaraz", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodEvento", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Qta", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 10, 2, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxPosizione", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[6].Connection = this.Connection; + this._commandCollection[6].CommandText = "dbo.stp_UDC_updateQty"; + this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.VarChar, 16, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodTipoDichiaraz", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodEvento", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Qta", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 10, 2, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -12301,7 +12311,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno [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.ElencoCartelliniDataTable updateQty(string UDC, string CodSoggetto, string CodTipoDichiaraz, string CodEvento, global::System.Nullable Qta) { + public virtual DS_magazzino.ElencoCartelliniDataTable updateIdxPosizione(string UDC, string CodSoggetto, string CodTipoDichiaraz, string CodEvento, global::System.Nullable IdxPosizione) { this.Adapter.SelectCommand = this.CommandCollection[5]; if ((UDC == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; @@ -12327,6 +12337,46 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno else { this.Adapter.SelectCommand.Parameters[4].Value = ((string)(CodEvento)); } + if ((IdxPosizione.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[5].Value = ((int)(IdxPosizione.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value; + } + DS_magazzino.ElencoCartelliniDataTable dataTable = new DS_magazzino.ElencoCartelliniDataTable(); + 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.ElencoCartelliniDataTable updateQty(string UDC, string CodSoggetto, string CodTipoDichiaraz, string CodEvento, global::System.Nullable Qta) { + this.Adapter.SelectCommand = this.CommandCollection[6]; + if ((UDC == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(UDC)); + } + if ((CodSoggetto == null)) { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(CodSoggetto)); + } + if ((CodTipoDichiaraz == null)) { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(CodTipoDichiaraz)); + } + if ((CodEvento == null)) { + this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[4].Value = ((string)(CodEvento)); + } if ((Qta.HasValue == true)) { this.Adapter.SelectCommand.Parameters[5].Value = ((decimal)(Qta.Value)); } @@ -17920,7 +17970,7 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT Particolare, DescParticolare, NumUDC, TotQta, NumInMag FROM dbo.V_Particol" + @@ -17928,25 +17978,36 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co 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_ParticolariOverviewLikePrefix"; + this._commandCollection[1].CommandText = "dbo.stp_ParticolariOverviewPerListaPrelievo"; 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("@searchVal", 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("@Particolare", 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("@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("@Esponente", global::System.Data.SqlDbType.NVarChar, 6, 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("@Figura", global::System.Data.SqlDbType.NVarChar, 4, 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("@CodImballo", global::System.Data.SqlDbType.NVarChar, 15, 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("@CodTipoLista", global::System.Data.SqlDbType.NVarChar, 10, 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_ParticolariOverviewLike"; + this._commandCollection[2].CommandText = "dbo.stp_ParticolariOverviewLikePrefix"; 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("@searchVal", 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("@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] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = "dbo.stp_ParticolariOverview"; + this._commandCollection[3].CommandText = "dbo.stp_ParticolariOverviewLike"; 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("@searchVal", 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("@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] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[4].Connection = this.Connection; + this._commandCollection[4].CommandText = "dbo.stp_ParticolariOverview"; + 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("@searchVal", 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("@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()] @@ -17974,13 +18035,13 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_magazzino.V_ParticolariOverviewDataTable getByLikePrefix(string searchVal, string CodCS) { + public virtual DS_magazzino.V_ParticolariOverviewDataTable getByDatiListaPrelievo(string Particolare, string CodCS, string Esponente, string Figura, string CodImballo, string CodTipoLista) { this.Adapter.SelectCommand = this.CommandCollection[1]; - if ((searchVal == null)) { + if ((Particolare == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[1].Value = ((string)(searchVal)); + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(Particolare)); } if ((CodCS == null)) { this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; @@ -17988,6 +18049,30 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co else { this.Adapter.SelectCommand.Parameters[2].Value = ((string)(CodCS)); } + if ((Esponente == null)) { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(Esponente)); + } + if ((Figura == null)) { + this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[4].Value = ((string)(Figura)); + } + if ((CodImballo == null)) { + this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[5].Value = ((string)(CodImballo)); + } + if ((CodTipoLista == null)) { + this.Adapter.SelectCommand.Parameters[6].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[6].Value = ((string)(CodTipoLista)); + } DS_magazzino.V_ParticolariOverviewDataTable dataTable = new DS_magazzino.V_ParticolariOverviewDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -17996,7 +18081,7 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_magazzino.V_ParticolariOverviewDataTable getByLikeSearch(string searchVal, string CodCS) { + public virtual DS_magazzino.V_ParticolariOverviewDataTable getByLikePrefix(string searchVal, string CodCS) { this.Adapter.SelectCommand = this.CommandCollection[2]; if ((searchVal == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; @@ -18018,7 +18103,7 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_magazzino.V_ParticolariOverviewDataTable getByParticolareFull(string searchVal, string CodCS) { + public virtual DS_magazzino.V_ParticolariOverviewDataTable getByLikeSearch(string searchVal, string CodCS) { this.Adapter.SelectCommand = this.CommandCollection[3]; if ((searchVal == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; @@ -18036,6 +18121,28 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co 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_ParticolariOverviewDataTable getByParticolareFull(string searchVal, string CodCS) { + this.Adapter.SelectCommand = this.CommandCollection[4]; + if ((searchVal == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(searchVal)); + } + if ((CodCS == null)) { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(CodCS)); + } + DS_magazzino.V_ParticolariOverviewDataTable dataTable = new DS_magazzino.V_ParticolariOverviewDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } } /// diff --git a/GMW/GMW_data/DS_magazzino.xsd b/GMW/GMW_data/DS_magazzino.xsd index a61f2846..589a8762 100644 --- a/GMW/GMW_data/DS_magazzino.xsd +++ b/GMW/GMW_data/DS_magazzino.xsd @@ -265,6 +265,21 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno + + + + dbo.stp_UDC_updateIdxPosizione + + + + + + + + + + + @@ -1320,6 +1335,22 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co + + + + dbo.stp_ParticolariOverviewPerListaPrelievo + + + + + + + + + + + + @@ -2065,273 +2096,127 @@ SELECT IdxPosizione, DescPosizione FROM AnagPosizioni WHERE (IdxPosizione = @Idx - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2346,17 +2231,17 @@ SELECT IdxPosizione, DescPosizione FROM AnagPosizioni WHERE (IdxPosizione = @Idx - - - - - - - + + + + + + + - + @@ -2366,14 +2251,271 @@ SELECT IdxPosizione, DescPosizione FROM AnagPosizioni WHERE (IdxPosizione = @Idx - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2387,101 +2529,319 @@ SELECT IdxPosizione, DescPosizione FROM AnagPosizioni WHERE (IdxPosizione = @Idx - + + + + + + + + + + - + - - - - - - - - + - - - - - - - - - - - + - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + - + + + + + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2498,350 +2858,21 @@ SELECT IdxPosizione, DescPosizione FROM AnagPosizioni WHERE (IdxPosizione = @Idx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -2854,8 +2885,8 @@ SELECT IdxPosizione, DescPosizione FROM AnagPosizioni WHERE (IdxPosizione = @Idx - - + + @@ -2868,17 +2899,17 @@ SELECT IdxPosizione, DescPosizione FROM AnagPosizioni WHERE (IdxPosizione = @Idx - - + + - - - + + + diff --git a/GMW/GMW_data/DS_magazzino.xss b/GMW/GMW_data/DS_magazzino.xss index 8ca64674..6ebf21fc 100644 --- a/GMW/GMW_data/DS_magazzino.xss +++ b/GMW/GMW_data/DS_magazzino.xss @@ -4,27 +4,27 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - - - + + + - - - - - - - - - - + + + + + + + + + + @@ -63,7 +63,7 @@ - + 712 @@ -99,11 +99,11 @@ - + 133 - 714 + 771 133 @@ -111,7 +111,7 @@ - + 430 @@ -123,7 +123,7 @@ - + 735 @@ -135,7 +135,7 @@ - + 392 diff --git a/GMW/GMW_data/GMW_data.csproj b/GMW/GMW_data/GMW_data.csproj index 49e3934a..b467daf2 100644 --- a/GMW/GMW_data/GMW_data.csproj +++ b/GMW/GMW_data/GMW_data.csproj @@ -160,6 +160,7 @@ SettingsSingleFileGenerator Settings.Designer.cs + @@ -178,6 +179,8 @@ + +
- +